svn: 1285

autotools/configure.ac

@@ -30,9 +30,8 @@ EGG_CHECK_CCPIPE
 
 EGG_CHECK_DEPMODE
 
-# Create static binaries
-EGG_CHECK_CCSTATIC
-AC_SUBST(CCDEBUG)dnl
+#checkpoint
+AC_CACHE_SAVE 
 
 # Checks for programs
 AC_PROG_MAKE_SET
@@ -54,6 +53,10 @@ EGG_CHECK_DNS
 EGG_IPV6_OPTIONS
 EGG_CHECK_SOCKLEN_T
 
+# Create static binaries
+EGG_CHECK_CCSTATIC
+AC_SUBST(CCDEBUG)dnl
+
 #checkpoint
 AC_CACHE_SAVE 
 

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.33 .
+# From configure.ac Revision: 1.34 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -313,7 +313,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CCDEPMODE GCC3 CCDEBUG SET_MAKE HEAD_1 AWK BASENAME OBJCOPY STRIP UNAME DISTCC RESLIB RESINCLUDE ZLIB LIBOBJS VERSION NUMVER WRAP MOD_UPDIR LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CCDEPMODE GCC3 SET_MAKE HEAD_1 AWK BASENAME OBJCOPY STRIP UNAME DISTCC RESLIB RESINCLUDE CCDEBUG ZLIB LIBOBJS VERSION NUMVER WRAP MOD_UPDIR LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -2995,85 +2995,61 @@ if test $num = "3"; then
 fi
 
 
-# Create static binaries
-if test -z "$no_static"
-then
-  if test -n "$GCC"
-  then
-    echo "$as_me:$LINENO: checking whether the compiler understands -static" >&5
-echo $ECHO_N "checking whether the compiler understands -static... $ECHO_C" >&6
-if test "${egg_cv_var_ccstatic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-        ac_old_CC="$CC"
-      CC="$CC -static"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
+#checkpoint
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
 
-  ;
-  return 0;
-}
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  egg_cv_var_ccstatic="yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-egg_cv_var_ccstatic="no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-      CC="$ac_old_CC"
 
-
-fi
-echo "$as_me:$LINENO: result: $egg_cv_var_ccstatic" >&5
-echo "${ECHO_T}$egg_cv_var_ccstatic" >&6
-    if test "$egg_cv_var_ccstatic" = "yes"
-    then
-      CCDEBUG="$CC"
-      CC="$CC -static"
-    else
-      cat << 'EOF' >&2
-configure: error:
-
-  Your C compiler does not support -static.
-  This compile flag is required for the botpack.
-
-EOF
-  exit 1
-    fi
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;;
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" 
+    cat confcache >$cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
   fi
 fi
-
+rm -f confcache
 
 # Checks for programs
 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
@@ -4743,6 +4719,86 @@ echo "${ECHO_T}no" >&6
 fi
 
 
+# Create static binaries
+if test -z "$no_static"
+then
+  if test -n "$GCC"
+  then
+    echo "$as_me:$LINENO: checking whether the compiler understands -static" >&5
+echo $ECHO_N "checking whether the compiler understands -static... $ECHO_C" >&6
+if test "${egg_cv_var_ccstatic+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+        ac_old_CC="$CC"
+      CC="$CC -static"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  egg_cv_var_ccstatic="yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+egg_cv_var_ccstatic="no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+      CC="$ac_old_CC"
+
+
+fi
+echo "$as_me:$LINENO: result: $egg_cv_var_ccstatic" >&5
+echo "${ECHO_T}$egg_cv_var_ccstatic" >&6
+    if test "$egg_cv_var_ccstatic" = "yes"
+    then
+      CCDEBUG="$CC"
+      CC="$CC -static"
+    else
+      cat << 'EOF' >&2
+configure: error:
+
+  Your C compiler does not support -static.
+  This compile flag is required for the botpack.
+
+EOF
+  exit 1
+    fi
+  fi
+fi
+
+
 #checkpoint
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -12497,7 +12553,6 @@ s,@CPP@,$CPP,;t t
 s,@EGREP@,$EGREP,;t t
 s,@CCDEPMODE@,$CCDEPMODE,;t t
 s,@GCC3@,$GCC3,;t t
-s,@CCDEBUG@,$CCDEBUG,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@HEAD_1@,$HEAD_1,;t t
 s,@AWK@,$AWK,;t t
@@ -12508,6 +12563,7 @@ s,@UNAME@,$UNAME,;t t
 s,@DISTCC@,$DISTCC,;t t
 s,@RESLIB@,$RESLIB,;t t
 s,@RESINCLUDE@,$RESINCLUDE,;t t
+s,@CCDEBUG@,$CCDEBUG,;t t
 s,@ZLIB@,$ZLIB,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@VERSION@,$VERSION,;t t