From da99a51047183f378cc6bb261cfa9559187ffd9f Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Fri, 16 Jan 2009 20:09:52 +0000 Subject: [PATCH] tcl - autoconf --- Makefile.in | 1 + configure | 136 ++++++++++++++++++++++++++----- configure.ac | 7 ++ libsrc/Makefile.in | 1 + libsrc/csg/Makefile.in | 1 + libsrc/general/Makefile.in | 1 + libsrc/geom2d/Makefile.in | 1 + libsrc/gprim/Makefile.in | 1 + libsrc/include/Makefile.in | 1 + libsrc/interface/Makefile.am | 2 +- libsrc/interface/Makefile.in | 3 +- libsrc/linalg/Makefile.in | 1 + libsrc/meshing/Makefile.in | 1 + libsrc/occ/Makefile.in | 1 + libsrc/opti/Makefile.in | 1 + libsrc/parallel/Makefile.in | 1 + libsrc/stlgeom/Makefile.in | 1 + libsrc/visualization/Makefile.am | 2 +- libsrc/visualization/Makefile.in | 3 +- ng/Makefile.am | 4 +- ng/Makefile.in | 5 +- tutorials/Makefile.in | 1 + 22 files changed, 148 insertions(+), 28 deletions(-) diff --git a/Makefile.in b/Makefile.in index b4a7c3e4..e9a6e597 100644 --- a/Makefile.in +++ b/Makefile.in @@ -150,6 +150,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/configure b/configure index b31a50f1..fbd064b1 100755 --- a/configure +++ b/configure @@ -840,6 +840,7 @@ CPPFLAGS LDFLAGS CXXFLAGS CXX +TCL_INCLUDES TK_XINCLUDES TK_LIBS TK_STUB_LIB_SPEC @@ -941,6 +942,7 @@ ac_user_opts=' enable_option_checking with_tcl with_tk +with_tclinclude enable_occ with_occ with_togl @@ -1610,6 +1612,7 @@ Optional Packages: --with-tcl directory containing tcl configuration (tclConfig.sh) --with-tk directory containing tk configuration (tkConfig.sh) + --with-tclinclude directory containing the public Tcl header files --with-occ=dir use OpenCascade installed in directory dir --with-togl=dir directory containing libTogl1.7 --with-pic try to use only PIC/non-PIC objects [default=use @@ -3116,9 +3119,102 @@ _ACEOF + + { $as_echo "$as_me:$LINENO: checking for Tcl public headers" >&5 +$as_echo_n "checking for Tcl public headers... " >&6; } + + +# Check whether --with-tclinclude was given. +if test "${with_tclinclude+set}" = set; then + withval=$with_tclinclude; with_tclinclude=${withval} +fi + + + if test "${ac_cv_c_tclh+set}" = set; then + $as_echo_n "(cached) " >&6 +else + + # Use the value from --with-tclinclude, if it was given + + if test x"${with_tclinclude}" != x ; then + if test -f "${with_tclinclude}/tcl.h" ; then + ac_cv_c_tclh=${with_tclinclude} + else + { { $as_echo "$as_me:$LINENO: error: ${with_tclinclude} directory does not contain tcl.h" >&5 +$as_echo "$as_me: error: ${with_tclinclude} directory does not contain tcl.h" >&2;} + { (exit 1); exit 1; }; } + fi + else + if test "`uname -s`" = "Darwin"; then + # If Tcl was built as a framework, attempt to use + # the framework's Headers directory + case ${TCL_DEFS} in + *TCL_FRAMEWORK*) + list="`ls -d ${TCL_BIN_DIR}/Headers 2>/dev/null`" + ;; + esac + fi + + # Look in the source dir only if Tcl is not installed, + # and in that situation, look there before installed locations. + if test -f "${TCL_BIN_DIR}/Makefile" ; then + list="$list `ls -d ${TCL_SRC_DIR}/generic 2>/dev/null`" + fi + + # Check order: pkg --prefix location, Tcl's --prefix location, + # relative to directory of tclConfig.sh. + + eval "temp_includedir=${includedir}" + list="$list \ + `ls -d ${temp_includedir} 2>/dev/null` \ + `ls -d ${TCL_PREFIX}/include 2>/dev/null` \ + `ls -d ${TCL_BIN_DIR}/../include 2>/dev/null`" + if test "${TEA_PLATFORM}" != "windows" -o "$GCC" = "yes"; then + list="$list /usr/local/include /usr/include" + if test x"${TCL_INCLUDE_SPEC}" != x ; then + d=`echo "${TCL_INCLUDE_SPEC}" | sed -e 's/^-I//'` + list="$list `ls -d ${d} 2>/dev/null`" + fi + fi + for i in $list ; do + if test -f "$i/tcl.h" ; then + ac_cv_c_tclh=$i + break + fi + done + fi + +fi + + + # Print a message based on how we determined the include path + + if test x"${ac_cv_c_tclh}" = x ; then + { { $as_echo "$as_me:$LINENO: error: tcl.h not found. Please specify its location with --with-tclinclude" >&5 +$as_echo "$as_me: error: tcl.h not found. Please specify its location with --with-tclinclude" >&2;} + { (exit 1); exit 1; }; } + else + { $as_echo "$as_me:$LINENO: result: ${ac_cv_c_tclh}" >&5 +$as_echo "${ac_cv_c_tclh}" >&6; } + fi + + # Convert to a native path and substitute into the output files. + + INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclh}` + + TCL_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" + + + + + + # TEA_PATH_TOGLCONFIG # TEA_LOAD_TOGLCONFIG +# TEA_PATH_TIXCONFIG +# TEA_LOAD_TIXCONFIG + # TEA_PREFIX # TEA_SETUP_COMPILER @@ -5450,13 +5546,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5453: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5549: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5456: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5552: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5459: output\"" >&5) + (eval echo "\"\$as_me:5555: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6662,7 +6758,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6665 "configure"' > conftest.$ac_ext + echo '#line 6761 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9238,11 +9334,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9241: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9337: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9245: \$? = $ac_status" >&5 + echo "$as_me:9341: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9577,11 +9673,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9580: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9676: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9584: \$? = $ac_status" >&5 + echo "$as_me:9680: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9682,11 +9778,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9685: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9781: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9689: \$? = $ac_status" >&5 + echo "$as_me:9785: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9737,11 +9833,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9740: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9836: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9744: \$? = $ac_status" >&5 + echo "$as_me:9840: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12537,7 +12633,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12540 "configure" +#line 12636 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12633,7 +12729,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12636 "configure" +#line 12732 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14653,11 +14749,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14656: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14752: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14660: \$? = $ac_status" >&5 + echo "$as_me:14756: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14752,11 +14848,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14755: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14851: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14759: \$? = $ac_status" >&5 + echo "$as_me:14855: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14804,11 +14900,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14807: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14903: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14811: \$? = $ac_status" >&5 + echo "$as_me:14907: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized diff --git a/configure.ac b/configure.ac index d433b504..f9090312 100644 --- a/configure.ac +++ b/configure.ac @@ -12,9 +12,16 @@ TEA_LOAD_TCLCONFIG TEA_PATH_TKCONFIG TEA_LOAD_TKCONFIG +TEA_PUBLIC_TCL_HEADERS + + + # TEA_PATH_TOGLCONFIG # TEA_LOAD_TOGLCONFIG +# TEA_PATH_TIXCONFIG +# TEA_LOAD_TIXCONFIG + # TEA_PREFIX # TEA_SETUP_COMPILER diff --git a/libsrc/Makefile.in b/libsrc/Makefile.in index 58d1c35c..3f3cb4e6 100644 --- a/libsrc/Makefile.in +++ b/libsrc/Makefile.in @@ -134,6 +134,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/libsrc/csg/Makefile.in b/libsrc/csg/Makefile.in index be6460d2..cb7be4a0 100644 --- a/libsrc/csg/Makefile.in +++ b/libsrc/csg/Makefile.in @@ -153,6 +153,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/libsrc/general/Makefile.in b/libsrc/general/Makefile.in index 7a453402..3a7a7390 100644 --- a/libsrc/general/Makefile.in +++ b/libsrc/general/Makefile.in @@ -151,6 +151,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/libsrc/geom2d/Makefile.in b/libsrc/geom2d/Makefile.in index 60d72eb8..6ae2c18c 100644 --- a/libsrc/geom2d/Makefile.in +++ b/libsrc/geom2d/Makefile.in @@ -147,6 +147,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/libsrc/gprim/Makefile.in b/libsrc/gprim/Makefile.in index f86d0c54..1aca4929 100644 --- a/libsrc/gprim/Makefile.in +++ b/libsrc/gprim/Makefile.in @@ -148,6 +148,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/libsrc/include/Makefile.in b/libsrc/include/Makefile.in index a91e6b80..d254069e 100644 --- a/libsrc/include/Makefile.in +++ b/libsrc/include/Makefile.in @@ -127,6 +127,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/libsrc/interface/Makefile.am b/libsrc/interface/Makefile.am index f8aa3f6b..01ed8de5 100644 --- a/libsrc/interface/Makefile.am +++ b/libsrc/interface/Makefile.am @@ -1,7 +1,7 @@ include_HEADERS = nginterface.h noinst_HEADERS = writeuser.hpp -AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface +AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(TCL_INCLUDES) METASOURCES = AUTO noinst_LIBRARIES = libinterface.a libinterface_a_SOURCES = importsolution.cpp nginterface.cpp printdest.cpp \ diff --git a/libsrc/interface/Makefile.in b/libsrc/interface/Makefile.in index d99f528e..44201986 100644 --- a/libsrc/interface/Makefile.in +++ b/libsrc/interface/Makefile.in @@ -163,6 +163,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ @@ -242,7 +243,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ include_HEADERS = nginterface.h noinst_HEADERS = writeuser.hpp -AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface +AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface $(TCL_INCLUDES) METASOURCES = AUTO noinst_LIBRARIES = libinterface.a libinterface_a_SOURCES = importsolution.cpp nginterface.cpp printdest.cpp \ diff --git a/libsrc/linalg/Makefile.in b/libsrc/linalg/Makefile.in index 4b9c26b3..29ff7baf 100644 --- a/libsrc/linalg/Makefile.in +++ b/libsrc/linalg/Makefile.in @@ -147,6 +147,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/libsrc/meshing/Makefile.in b/libsrc/meshing/Makefile.in index 108f03de..cd72df7e 100644 --- a/libsrc/meshing/Makefile.in +++ b/libsrc/meshing/Makefile.in @@ -161,6 +161,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/libsrc/occ/Makefile.in b/libsrc/occ/Makefile.in index 6c8de166..5e977ea6 100644 --- a/libsrc/occ/Makefile.in +++ b/libsrc/occ/Makefile.in @@ -150,6 +150,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/libsrc/opti/Makefile.in b/libsrc/opti/Makefile.in index b86cb575..f9c8af3c 100644 --- a/libsrc/opti/Makefile.in +++ b/libsrc/opti/Makefile.in @@ -147,6 +147,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/libsrc/parallel/Makefile.in b/libsrc/parallel/Makefile.in index 8bc89b3f..a02f7d37 100644 --- a/libsrc/parallel/Makefile.in +++ b/libsrc/parallel/Makefile.in @@ -127,6 +127,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/libsrc/stlgeom/Makefile.in b/libsrc/stlgeom/Makefile.in index 068b75bb..7bf2a429 100644 --- a/libsrc/stlgeom/Makefile.in +++ b/libsrc/stlgeom/Makefile.in @@ -148,6 +148,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ diff --git a/libsrc/visualization/Makefile.am b/libsrc/visualization/Makefile.am index 0f32d0c6..bbb9fb7e 100644 --- a/libsrc/visualization/Makefile.am +++ b/libsrc/visualization/Makefile.am @@ -1,7 +1,7 @@ noinst_HEADERS = meshdoc.hpp mvdraw.hpp soldata.hpp vispar.hpp \ visual.hpp vssolution.hpp -AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -DOPENGL $(OCCFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -DOPENGL $(OCCFLAGS) $(TCL_INCLUDES) METASOURCES = AUTO noinst_LIBRARIES = libvisual.a libvisual_a_SOURCES = meshdoc.cpp mvdraw.cpp stlmeshing.cpp vscsg.cpp \ diff --git a/libsrc/visualization/Makefile.in b/libsrc/visualization/Makefile.in index 615e7839..b64e8f70 100644 --- a/libsrc/visualization/Makefile.in +++ b/libsrc/visualization/Makefile.in @@ -148,6 +148,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ @@ -228,7 +229,7 @@ top_srcdir = @top_srcdir@ noinst_HEADERS = meshdoc.hpp mvdraw.hpp soldata.hpp vispar.hpp \ visual.hpp vssolution.hpp -AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -DOPENGL $(OCCFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -DOPENGL $(OCCFLAGS) $(TCL_INCLUDES) METASOURCES = AUTO noinst_LIBRARIES = libvisual.a libvisual_a_SOURCES = meshdoc.cpp mvdraw.cpp stlmeshing.cpp vscsg.cpp \ diff --git a/ng/Makefile.am b/ng/Makefile.am index 5e18343b..1839eabd 100644 --- a/ng/Makefile.am +++ b/ng/Makefile.am @@ -1,6 +1,6 @@ noinst_HEADERS = demoview.hpp -AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(OCCFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(OCCFLAGS) $(TCL_INCLUDES) METASOURCES = AUTO bin_PROGRAMS = netgen @@ -13,4 +13,4 @@ netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \ $(top_builddir)/libsrc/visualization/libvisual.a $(top_builddir)/libsrc/meshing/libmesh.a \ $(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/opti/libopti.a \ $(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a \ - $(OCCLIBS) $(TOGLLIBDIR) -lTogl1.7 -lGLU $(TK_LIB_FLAG) $(TCL_LIB_FLAG) + $(OCCLIBS) $(TOGLLIBDIR) -lTogl1.7 -lGLU $(TK_LIB_SPEC) $(TCL_LIB_SPEC) diff --git a/ng/Makefile.in b/ng/Makefile.in index 09ab14b0..4f807985 100644 --- a/ng/Makefile.in +++ b/ng/Makefile.in @@ -161,6 +161,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@ @@ -239,7 +240,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_HEADERS = demoview.hpp -AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(OCCFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL $(OCCFLAGS) $(TCL_INCLUDES) METASOURCES = AUTO netgen_SOURCES = demoview.cpp ngappinit.cpp ngpkg.cpp onetcl.cpp netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \ @@ -248,7 +249,7 @@ netgen_LDADD = $(top_builddir)/libsrc/csg/libcsg.a \ $(top_builddir)/libsrc/visualization/libvisual.a $(top_builddir)/libsrc/meshing/libmesh.a \ $(top_builddir)/libsrc/gprim/libgprim.a $(top_builddir)/libsrc/opti/libopti.a \ $(top_builddir)/libsrc/linalg/libla.a $(top_builddir)/libsrc/general/libgeneral.a \ - $(OCCLIBS) $(TOGLLIBDIR) -lTogl1.7 -lGLU $(TK_LIB_FLAG) $(TCL_LIB_FLAG) + $(OCCLIBS) $(TOGLLIBDIR) -lTogl1.7 -lGLU $(TK_LIB_SPEC) $(TCL_LIB_SPEC) all: all-am diff --git a/tutorials/Makefile.in b/tutorials/Makefile.in index 8f2fac21..1453c98a 100644 --- a/tutorials/Makefile.in +++ b/tutorials/Makefile.in @@ -133,6 +133,7 @@ STRIP = @STRIP@ TCL_BIN_DIR = @TCL_BIN_DIR@ TCL_DEFS = @TCL_DEFS@ TCL_EXTRA_CFLAGS = @TCL_EXTRA_CFLAGS@ +TCL_INCLUDES = @TCL_INCLUDES@ TCL_LD_FLAGS = @TCL_LD_FLAGS@ TCL_LIBS = @TCL_LIBS@ TCL_LIB_FILE = @TCL_LIB_FILE@