diff options
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/unix/configure b/unix/configure index cceaebf..cea947e 100755 --- a/unix/configure +++ b/unix/configure @@ -6236,6 +6236,8 @@ fi CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' if test "${TCL_THREADS}" = "1" ; then + # The -pthread needs to go in the CFLAGS, not LIBS + LIBS=`echo $LIBS | sed s/-pthread//` EXTRA_CFLAGS="-pthread" LDFLAGS="$LDFLAGS -pthread" fi @@ -6536,17 +6538,17 @@ EOF # that don't grok the -Bexport option. Test that it does. hold_ldflags=$LDFLAGS echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6 -echo "configure:6540: checking for ld accepts -Bexport flag" >&5 +echo "configure:6542: checking for ld accepts -Bexport flag" >&5 LDFLAGS="${LDFLAGS} -Wl,-Bexport" cat > conftest.$ac_ext <<EOF -#line 6543 "configure" +#line 6545 "configure" #include "confdefs.h" int main() { int i; ; return 0; } EOF -if { (eval echo configure:6550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* found=yes else @@ -6593,9 +6595,9 @@ rm -f conftest* if test "x$DL_OBJS" = "xtclLoadAout.o" ; then echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6 -echo "configure:6597: checking sys/exec.h" >&5 +echo "configure:6599: checking sys/exec.h" >&5 cat > conftest.$ac_ext <<EOF -#line 6599 "configure" +#line 6601 "configure" #include "confdefs.h" #include <sys/exec.h> int main() { @@ -6613,7 +6615,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=usable else @@ -6631,9 +6633,9 @@ EOF else echo $ac_n "checking a.out.h""... $ac_c" 1>&6 -echo "configure:6635: checking a.out.h" >&5 +echo "configure:6637: checking a.out.h" >&5 cat > conftest.$ac_ext <<EOF -#line 6637 "configure" +#line 6639 "configure" #include "confdefs.h" #include <a.out.h> int main() { @@ -6651,7 +6653,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=usable else @@ -6669,9 +6671,9 @@ EOF else echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6 -echo "configure:6673: checking sys/exec_aout.h" >&5 +echo "configure:6675: checking sys/exec_aout.h" >&5 cat > conftest.$ac_ext <<EOF -#line 6675 "configure" +#line 6677 "configure" #include "confdefs.h" #include <sys/exec_aout.h> int main() { @@ -6689,7 +6691,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=usable else @@ -6843,7 +6845,7 @@ fi echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:6847: checking for build with symbols" >&5 +echo "configure:6849: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" @@ -6869,7 +6871,7 @@ fi echo $ac_n "checking for build with memory debugging""... $ac_c" 1>&6 -echo "configure:6873: checking for build with memory debugging" >&5 +echo "configure:6875: checking for build with memory debugging" >&5 # Check whether --enable-memdebug or --disable-memdebug was given. if test "${enable_memdebug+set}" = set; then enableval="$enable_memdebug" @@ -6902,17 +6904,17 @@ TCL_DBGX=${DBGX} do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6906: checking for $ac_hdr" >&5 +echo "configure:6908: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6911 "configure" +#line 6913 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6942,17 +6944,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6946: checking for $ac_hdr" >&5 +echo "configure:6948: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6951 "configure" +#line 6953 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6979,7 +6981,7 @@ fi done echo $ac_n "checking FIONBIO vs. O_NONBLOCK for nonblocking I/O""... $ac_c" 1>&6 -echo "configure:6983: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5 +echo "configure:6985: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5 if test -f /usr/lib/NextStep/software_version; then system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` else @@ -7042,7 +7044,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" echo $ac_n "checking how to package libraries""... $ac_c" 1>&6 -echo "configure:7046: checking how to package libraries" >&5 +echo "configure:7048: checking how to package libraries" >&5 # Check whether --enable-framework or --disable-framework was given. if test "${enable_framework+set}" = set; then enableval="$enable_framework" |