summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2008-03-27 13:42:17 (GMT)
committerdas <das>2008-03-27 13:42:17 (GMT)
commit8eb8bbbca962b566d0e2525965e62f46a59e5b8c (patch)
treefcc74c3c87f479af43a7b3e6de9df8f26af923c0
parentee33907233fa2dc1ea507d875f1ccdd92b7fd6bf (diff)
downloadtcl-8eb8bbbca962b566d0e2525965e62f46a59e5b8c.zip
tcl-8eb8bbbca962b566d0e2525965e62f46a59e5b8c.tar.gz
tcl-8eb8bbbca962b566d0e2525965e62f46a59e5b8c.tar.bz2
* unix/configure: autoconf-2.13
-rwxr-xr-xunix/configure39
1 files changed, 10 insertions, 29 deletions
diff --git a/unix/configure b/unix/configure
index 3b068af..a9de1af 100755
--- a/unix/configure
+++ b/unix/configure
@@ -3996,7 +3996,7 @@ EOF
else
case $system in
SunOS-5.[1-9][0-9]*)
- SHLIB_LD='${CC} -G -z text';;
+ SHLIB_LD='${CC} -G -z text ${LDFLAGS}';;
*)
SHLIB_LD="/usr/ccs/bin/ld -G -z text";;
esac
@@ -9442,34 +9442,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section. Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
-t quote
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output. A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
+cat > conftest.defs <<\EOF
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+EOF
+DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+rm -f conftest.defs
# Without the "./", some shells look in PATH for config.status.