--disable-gui configuration flag

This commit is contained in:
Joachim Schoeberl 2012-08-29 18:49:42 +00:00
parent 2103a0d503
commit c2a3f5c149
8 changed files with 65 additions and 22 deletions

View File

@ -6,13 +6,6 @@ AC_CONFIG_MACRO_DIR([m4])
AC_PREFIX_DEFAULT(["/opt/netgen"]) AC_PREFIX_DEFAULT(["/opt/netgen"])
# Tcl/Tk configuration:
TEA_INIT([3.9])
TEA_PATH_TCLCONFIG
TEA_LOAD_TCLCONFIG
TEA_PATH_TKCONFIG
TEA_LOAD_TKCONFIG
TEA_PUBLIC_TCL_HEADERS
@ -27,6 +20,7 @@ LT_INIT
# OpenCASCADE configuration # OpenCASCADE configuration
occon=false
AC_ARG_ENABLE([occ], AC_ARG_ENABLE([occ],
[AC_HELP_STRING([--enable-occ],[compile with OpenCascade geometry kernel])], [AC_HELP_STRING([--enable-occ],[compile with OpenCascade geometry kernel])],
[occon=true]) [occon=true])
@ -84,6 +78,11 @@ AC_ARG_ENABLE([nglib],
[AC_HELP_STRING([--enable-nglib],[generate shared library nglib])], [AC_HELP_STRING([--enable-nglib],[generate shared library nglib])],
[if test "$enableval" = yes; then nglibon=true; else nglibon=false; fi]) [if test "$enableval" = yes; then nglibon=true; else nglibon=false; fi])
ngguion=true
AC_ARG_ENABLE([gui],
[AC_HELP_STRING([--disable-gui],[don't build netgen with GUI])],
[if test "$enableval" = yes; then ngguion=true; else ngguion=false; fi])
AC_ARG_ENABLE([parallel], AC_ARG_ENABLE([parallel],
[AC_HELP_STRING([--enable-parallel],[enable mpi parallelization])], [AC_HELP_STRING([--enable-parallel],[enable mpi parallelization])],
@ -128,21 +127,23 @@ AC_ARG_ENABLE([ffmpeg],
) )
AM_CONDITIONAL([NGLIB], [test x$nglibon = xtrue])
# only for GUI version
if test a$ngguion = atrue ; then
# Tcl/Tk configuration:
TEA_INIT([3.9])
TEA_PATH_TCLCONFIG
TEA_LOAD_TCLCONFIG
TEA_PATH_TKCONFIG
TEA_LOAD_TKCONFIG
TEA_PUBLIC_TCL_HEADERS
AC_SUBST([TOGLLIBDIR], ["$togllibfl"]) AC_SUBST([TOGLLIBDIR], ["$togllibfl"])
AC_CHECK_HEADER(pthread.h)
AC_CHECK_HEADER([togl.h]) AC_CHECK_HEADER([togl.h])
AC_CHECK_HEADER([GL/gl.h]) AC_CHECK_HEADER([GL/gl.h])
AC_CHECK_FUNCS([pow])
AC_CHECK_FUNCS([floor])
AC_CHECK_FUNCS([matherr])
AC_CHECK_HEADERS([limits.h])
AC_CHECK_LIB(pthread, pthread_create)
#-------------------------------------------------------------------- #--------------------------------------------------------------------
@ -177,6 +178,22 @@ case "${TEA_WINDOWINGSYSTEM}" in
esac esac
AC_SUBST(LIBGLU) AC_SUBST(LIBGLU)
fi
AM_CONDITIONAL([NGLIB], [test x$nglibon = xtrue])
AM_CONDITIONAL([NGGUI], [test x$ngguion = xtrue])
AC_CHECK_HEADER(pthread.h)
AC_CHECK_FUNCS([pow])
AC_CHECK_FUNCS([floor])
AC_CHECK_FUNCS([matherr])
AC_CHECK_HEADERS([limits.h])
AC_CHECK_LIB(pthread, pthread_create)
@ -207,6 +224,7 @@ AC_MSG_RESULT([
JPEGlib: ........... $jpeglibon JPEGlib: ........... $jpeglibon
FFMPEG: ............ $ffmpegon FFMPEG: ............ $ffmpegon
NGLIB: ............. $nglibon NGLIB: ............. $nglibon
GUI: ............... $ngguion
Building: Building:

View File

@ -8,7 +8,11 @@ revolution.hpp spline3d.hpp vscsg.hpp
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES)
METASOURCES = AUTO METASOURCES = AUTO
lib_LTLIBRARIES = libcsg.la libcsgvis.la lib_LTLIBRARIES = libcsg.la
if NGGUI
lib_LTLIBRARIES += libcsgvis.la
endif
libcsg_la_SOURCES = algprim.cpp brick.cpp \ libcsg_la_SOURCES = algprim.cpp brick.cpp \

View File

@ -3,7 +3,14 @@ noinst_HEADERS = geom2dmesh.hpp geometry2d.hpp vsgeom2d.hpp
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES)
METASOURCES = AUTO METASOURCES = AUTO
lib_LTLIBRARIES = libgeom2d.la libgeom2dvis.la
lib_LTLIBRARIES = libgeom2d.la
if NGGUI
lib_LTLIBRARIES += libgeom2dvis.la
endif
libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp
libgeom2d_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la libgeom2d_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la

View File

@ -8,10 +8,11 @@
#include "../sockets/sockets.hpp" #include "../sockets/sockets.hpp"
#endif #endif
/*
#ifndef NOTCL #ifndef NOTCL
#include <visual.hpp> #include <visual.hpp>
#endif #endif
*/
#include "nginterface.h" #include "nginterface.h"
#include "../visualization/soldata.hpp" #include "../visualization/soldata.hpp"

View File

@ -7,10 +7,11 @@
#include "../sockets/sockets.hpp" #include "../sockets/sockets.hpp"
#endif #endif
/*
#ifndef NOTCL #ifndef NOTCL
#include <visual.hpp> #include <visual.hpp>
#endif #endif
*/
#include "nginterface.h" #include "nginterface.h"
#include "nginterface_v2.hpp" #include "nginterface_v2.hpp"

View File

@ -4,7 +4,11 @@ stltool.hpp stltopology.hpp vsstl.hpp
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES)
METASOURCES = AUTO METASOURCES = AUTO
lib_LTLIBRARIES = libstl.la libstlvis.la lib_LTLIBRARIES = libstl.la
if NGGUI
lib_LTLIBRARIES += libstlvis.la
endif
libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \
stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp

View File

@ -5,7 +5,12 @@ include_HEADERS = soldata.hpp
AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES) AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES)
METASOURCES = AUTO METASOURCES = AUTO
if NGGUI
noinst_LIBRARIES = libvisual.a noinst_LIBRARIES = libvisual.a
endif
libvisual_a_SOURCES = meshdoc.cpp mvdraw.cpp \ libvisual_a_SOURCES = meshdoc.cpp mvdraw.cpp \
vsfieldlines.cpp vsmesh.cpp vssolution.cpp importsolution.cpp vsfieldlines.cpp vsmesh.cpp vssolution.cpp importsolution.cpp
AM_CXXFLAGS = -DOPENGL AM_CXXFLAGS = -DOPENGL

View File

@ -2,7 +2,10 @@ include_HEADERS =
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES)
if NGGUI
bin_PROGRAMS = netgen bin_PROGRAMS = netgen
endif
netgen_SOURCES = demoview.cpp ngappinit.cpp onetcl.cpp parallelfunc.cpp ngpkg.cpp demoview.hpp parallelfunc.hpp togl_1_7.h netgen_SOURCES = demoview.cpp ngappinit.cpp onetcl.cpp parallelfunc.cpp ngpkg.cpp demoview.hpp parallelfunc.hpp togl_1_7.h
# nginterface.cpp nginterface_v2.cpp # nginterface.cpp nginterface_v2.cpp