summaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2007-06-02 08:18:15 +0000
committerPaolo Bonzini <bonzini@gcc.gnu.org>2007-06-02 08:18:15 +0000
commit82a6cadf506e70f45ca7f716688656040a793551 (patch)
tree63e5de7c96809394f761cb1c5a4c73b0edc83013 /zlib
parentadb04511e38c5ce6929a7e539c6d014464b5aa03 (diff)
configure: Regenerate.
boehm-gc: 2007-06-02 Paolo Bonzini <bonzini@gnu.org> * configure: Regenerate. libffi: 2007-06-02 Paolo Bonzini <bonzini@gnu.org> * configure: Regenerate. libgfortran: 2007-06-02 Paolo Bonzini <bonzini@gnu.org> * configure: Regenerate. libgomp: 2007-06-02 Paolo Bonzini <bonzini@gnu.org> * configure: Regenerate. libjava: 2007-06-02 Paolo Bonzini <bonzini@gnu.org> * configure: Regenerate. libmudflap: 2007-06-02 Paolo Bonzini <bonzini@gnu.org> * configure: Regenerate. libobjc: 2007-06-02 Paolo Bonzini <bonzini@gnu.org> * configure: Regenerate. libssp: 2007-06-02 Paolo Bonzini <bonzini@gnu.org> * configure: Regenerate. libstdc++-v3: 2007-06-02 Paolo Bonzini <bonzini@gnu.org> * configure: Regenerate. zlib: 2007-06-02 Paolo Bonzini <bonzini@gnu.org> * configure: Regenerate. From-SVN: r125278
Diffstat (limited to 'zlib')
-rwxr-xr-xzlib/configure74
1 files changed, 40 insertions, 34 deletions
diff --git a/zlib/configure b/zlib/configure
index 7a4783eb794..b6cb73828de 100755
--- a/zlib/configure
+++ b/zlib/configure
@@ -3889,29 +3889,35 @@ else
fi
;;
*)
- # Make teststring a little bigger before we do anything with it.
- # a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
- teststring=$teststring$teststring
- done
- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- teststring=$teststring$teststring
- done
- # Only check the string length outside the loop.
- lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
- teststring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ lt_cv_sys_max_cmd_len=`getconf ARG_MAX 2> /dev/null`
+ if test -n $lt_cv_sys_max_cmd_len; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ # Make teststring a little bigger before we do anything with it.
+ # a 1K string should be a reasonable start.
+ for i in 1 2 3 4 5 6 7 8 ; do
+ teststring=$teststring$teststring
+ done
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ # Only check the string length outside the loop.
+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on
+ # massive amounts of additional arguments before passing them to the
+ # linker. It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
;;
esac
@@ -4832,7 +4838,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4835 "configure"' > conftest.$ac_ext
+ echo '#line 4841 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5937,11 +5943,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:5940: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:5946: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:5944: \$? = $ac_status" >&5
+ echo "$as_me:5950: \$? = $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.
@@ -6259,11 +6265,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:6262: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6268: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6266: \$? = $ac_status" >&5
+ echo "$as_me:6272: \$? = $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.
@@ -6364,11 +6370,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:6367: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6373: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6371: \$? = $ac_status" >&5
+ echo "$as_me:6377: \$? = $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
@@ -6419,11 +6425,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:6422: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6428: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6426: \$? = $ac_status" >&5
+ echo "$as_me:6432: \$? = $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
@@ -9271,7 +9277,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 9274 "configure"
+#line 9280 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9371,7 +9377,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 9374 "configure"
+#line 9380 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H