From cb85aa7115a7384f3855efafa71395be8bab8298 Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Thu, 21 Jul 2016 11:24:21 -0400 Subject: [PATCH] Updated configure script to extract the paths for the Tcl and Tk lib and include files, so that subsequent checks for those files are not disjoint from the contents of tclConfig.sh and tkConfig.sh. --- defs.mak | 2 +- scripts/config.log | 79 +++++++++++++++++++++---------------------- scripts/config.status | 2 +- scripts/configure | 23 +++++++++++-- scripts/configure.in | 19 +++++++++++ scripts/defs.mak | 2 +- 6 files changed, 82 insertions(+), 45 deletions(-) diff --git a/defs.mak b/defs.mak index 19e534d..edb786d 100644 --- a/defs.mak +++ b/defs.mak @@ -65,7 +65,7 @@ CPP = gcc -E -x c CXX = @CXX@ CPPFLAGS = -I. -I${NETGENDIR} -DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"eda-dev@opencircuitdesign.com\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"54\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG +DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"eda-dev@opencircuitdesign.com\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"57\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG CFLAGS = -g -m64 -fPIC -fPIC DEPEND_FILE = Depend diff --git a/scripts/config.log b/scripts/config.log index da3ae98..d953218 100644 --- a/scripts/config.log +++ b/scripts/config.log @@ -33,7 +33,6 @@ PATH: /sbin PATH: /usr/bin PATH: /usr/sbin PATH: /usr/local/bin -PATH: /home/tim/src/timberwolf-6.3/bin ## ----------- ## @@ -126,7 +125,7 @@ configure: failed program was: | #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" | #define PACKAGE_URL "" | #define NETGEN_VERSION "1.5" -| #define NETGEN_REVISION "54" +| #define NETGEN_REVISION "57" | /* end confdefs.h. */ | #include configure:3382: result: gcc -E @@ -147,7 +146,7 @@ configure: failed program was: | #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" | #define PACKAGE_URL "" | #define NETGEN_VERSION "1.5" -| #define NETGEN_REVISION "54" +| #define NETGEN_REVISION "57" | /* end confdefs.h. */ | #include configure:3445: checking for library containing strerror @@ -262,7 +261,7 @@ configure: failed program was: | #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" | #define PACKAGE_URL "" | #define NETGEN_VERSION "1.5" -| #define NETGEN_REVISION "54" +| #define NETGEN_REVISION "57" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 @@ -303,7 +302,7 @@ configure: failed program was: | #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" | #define PACKAGE_URL "" | #define NETGEN_VERSION "1.5" -| #define NETGEN_REVISION "54" +| #define NETGEN_REVISION "57" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 @@ -383,7 +382,7 @@ configure: failed program was: | #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" | #define PACKAGE_URL "" | #define NETGEN_VERSION "1.5" -| #define NETGEN_REVISION "54" +| #define NETGEN_REVISION "57" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 @@ -455,7 +454,7 @@ configure: failed program was: | #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" | #define PACKAGE_URL "" | #define NETGEN_VERSION "1.5" -| #define NETGEN_REVISION "54" +| #define NETGEN_REVISION "57" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 @@ -492,37 +491,37 @@ configure:4831: checking for tclConfig.sh configure:4903: result: /usr/lib64/tclConfig.sh configure:4919: checking for tkConfig.sh configure:4992: result: /usr/lib64/tkConfig.sh -configure:5106: checking for wish executable -configure:5133: result: /usr/bin/wish -configure:5139: checking for tclsh executable -configure:5165: result: /usr/bin/tclsh -configure:5288: checking for X -configure:5427: gcc -o conftest -g conftest.c -lX11 >&5 -configure:5427: $? = 0 -configure:5477: result: libraries , headers -configure:5576: gcc -o conftest -g conftest.c -lX11 >&5 -configure:5576: $? = 0 -configure:5674: checking for gethostbyname -configure:5674: gcc -o conftest -g conftest.c >&5 -configure:5674: $? = 0 -configure:5674: result: yes -configure:5771: checking for connect -configure:5771: gcc -o conftest -g conftest.c >&5 -configure:5771: $? = 0 -configure:5771: result: yes -configure:5820: checking for remove -configure:5820: gcc -o conftest -g conftest.c >&5 -configure:5820: $? = 0 -configure:5820: result: yes -configure:5869: checking for shmat -configure:5869: gcc -o conftest -g conftest.c >&5 -configure:5869: $? = 0 -configure:5869: result: yes -configure:5927: checking for IceConnectionNumber in -lICE -configure:5952: gcc -o conftest -g conftest.c -lICE >&5 -configure:5952: $? = 0 -configure:5961: result: yes -configure:6675: creating ./config.status +configure:5125: checking for wish executable +configure:5152: result: /usr/bin/wish +configure:5158: checking for tclsh executable +configure:5184: result: /usr/bin/tclsh +configure:5307: checking for X +configure:5446: gcc -o conftest -g conftest.c -lX11 >&5 +configure:5446: $? = 0 +configure:5496: result: libraries , headers +configure:5595: gcc -o conftest -g conftest.c -lX11 >&5 +configure:5595: $? = 0 +configure:5693: checking for gethostbyname +configure:5693: gcc -o conftest -g conftest.c >&5 +configure:5693: $? = 0 +configure:5693: result: yes +configure:5790: checking for connect +configure:5790: gcc -o conftest -g conftest.c >&5 +configure:5790: $? = 0 +configure:5790: result: yes +configure:5839: checking for remove +configure:5839: gcc -o conftest -g conftest.c >&5 +configure:5839: $? = 0 +configure:5839: result: yes +configure:5888: checking for shmat +configure:5888: gcc -o conftest -g conftest.c >&5 +configure:5888: $? = 0 +configure:5888: result: yes +configure:5946: checking for IceConnectionNumber in -lICE +configure:5971: gcc -o conftest -g conftest.c -lICE >&5 +configure:5971: $? = 0 +configure:5980: result: yes +configure:6694: creating ./config.status ## ---------------------- ## ## Running config.status. ## @@ -622,7 +621,7 @@ CC='gcc' CFLAGS='-g -m64 -fPIC' CPP='gcc -E -x c' CPPFLAGS='' -DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"eda-dev@opencircuitdesign.com\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"54\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1' +DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"eda-dev@opencircuitdesign.com\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"57\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1' DEPEND_FLAG='-MM' ECHO_C='' ECHO_N='printf' @@ -735,7 +734,7 @@ unused='' #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" #define PACKAGE_URL "" #define NETGEN_VERSION "1.5" -#define NETGEN_REVISION "54" +#define NETGEN_REVISION "57" #define STDC_HEADERS 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 diff --git a/scripts/config.status b/scripts/config.status index 1508f6a..cfabbe0 100755 --- a/scripts/config.status +++ b/scripts/config.status @@ -657,7 +657,7 @@ S["ECHO_T"]="" S["ECHO_N"]="-n" S["ECHO_C"]="" S["DEFS"]="-DPACKAGE_NAME=\\\"netgen\\\" -DPACKAGE_TARNAME=\\\"netgen\\\" -DPACKAGE_VERSION=\\\"1.3\\\" -DPACKAGE_STRING=\\\"netgen\\ 1.3\\\" -DPACKAGE_BUGREPORT=\\\"eda-dev@open"\ -"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"54\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\ +"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"57\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\ "DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -D"\ "SIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHA"\ "VE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1" diff --git a/scripts/configure b/scripts/configure index 5d0892b..8b9e98e 100755 --- a/scripts/configure +++ b/scripts/configure @@ -4861,7 +4861,7 @@ $as_echo_n "checking for tclConfig.sh... " >&6; } # 1. Search previously named locations. for dir in \ - $prefix \ + $ac_default_prefix \ $exec_prefix do if test -r "$dir/tclConfig.sh" ; then @@ -4948,7 +4948,7 @@ $as_echo_n "checking for tkConfig.sh... " >&6; } # 1. Search previously named locations. # for dir in \ - $prefix \ + $ac_default_prefix \ $exec_prefix do if test -r "$dir/tkConfig.sh" ; then @@ -5007,6 +5007,25 @@ if test $usingTcl ; then . $tcl_config_sh . $tk_config_sh + # Should probably trust the config file contents, but this configure + # file checks the Tcl and Tk include and lib directories. Since + # the config file doesn't separate out the libraries from the strings + # passed to the compiler/linker, do it manually here. + # + # Extract TCL_LIB_DIR from TCL_LIB_SPEC + # Extract TK_LIB_DIR from TK_LIB_SPEC + # Extract TCL_INC_DIR from TCL_INCLUDE_SPEC + # Extract TK_INC_DIR from TK_INCLUDE_SPEC + # + # These will be the defaults unless overridden by configure command line + + tmpstr=${TCL_LIB_SPEC#*-L} + TCL_LIB_DIR=${tmpstr% -l*} + tmpstr=${TK_LIB_SPEC#*-L} + TK_LIB_DIR=${tmpstr% -l*} + TCL_INC_DIR=${TCL_INCLUDE_SPEC#*-I} + TK_INC_DIR=${TK_INCLUDE_SPEC#*-I} + if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then : elif test "$TCL_VERSION" = "7.5" -a "$TK_VERSION" = "4.1" ; then diff --git a/scripts/configure.in b/scripts/configure.in index f88c3f6..24ab03a 100644 --- a/scripts/configure.in +++ b/scripts/configure.in @@ -472,6 +472,25 @@ if test $usingTcl ; then . $tcl_config_sh . $tk_config_sh + # Should probably trust the config file contents, but this configure + # file checks the Tcl and Tk include and lib directories. Since + # the config file doesn't separate out the libraries from the strings + # passed to the compiler/linker, do it manually here. + # + # Extract TCL_LIB_DIR from TCL_LIB_SPEC + # Extract TK_LIB_DIR from TK_LIB_SPEC + # Extract TCL_INC_DIR from TCL_INCLUDE_SPEC + # Extract TK_INC_DIR from TK_INCLUDE_SPEC + # + # These will be the defaults unless overridden by configure command line + + tmpstr=${TCL_LIB_SPEC#*-L} + TCL_LIB_DIR=${tmpstr% -l*} + tmpstr=${TK_LIB_SPEC#*-L} + TK_LIB_DIR=${tmpstr% -l*} + TCL_INC_DIR=${TCL_INCLUDE_SPEC#*-I} + TK_INC_DIR=${TK_INCLUDE_SPEC#*-I} + if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then : elif test "$TCL_VERSION" = "7.5" -a "$TK_VERSION" = "4.1" ; then diff --git a/scripts/defs.mak b/scripts/defs.mak index 19e534d..edb786d 100644 --- a/scripts/defs.mak +++ b/scripts/defs.mak @@ -65,7 +65,7 @@ CPP = gcc -E -x c CXX = @CXX@ CPPFLAGS = -I. -I${NETGENDIR} -DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"eda-dev@opencircuitdesign.com\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"54\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG +DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"eda-dev@opencircuitdesign.com\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"57\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG CFLAGS = -g -m64 -fPIC -fPIC DEPEND_FILE = Depend