From: hno <>
Date: Wed, 22 Mar 2006 08:10:50 +0000 (+0000)
Subject: Bootstrapped
X-Git-Tag: SQUID_3_0_PRE4~278
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cec01b94e1ae2008a930736d7362dd8c009fe419;p=thirdparty%2Fsquid.git

Bootstrapped
---

diff --git a/configure b/configure
index 3a799736d7..4363125bbe 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.401 .
+# From configure.in Revision: 1.402 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -3285,6 +3285,109 @@ else
 fi
 
 
+if test "x$CC" != xcc; then
+  echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6
+else
+  echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6
+fi
+set dummy $CC; ac_cc=`echo $2 |
+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  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
+# Make sure it works both with $CC and with simple cc.
+# We do the test twice because some compilers refuse to overwrite an
+# existing .o file with -o, though they will create one.
+ac_try='$CC -c conftest.$ac_ext -o conftest.$ac_objext >&5'
+if { (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); } &&
+   test -f 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
+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+  if test "x$CC" != xcc; then
+    # Test first that cc exists at all.
+    if { ac_try='cc -c conftest.$ac_ext >&5'
+  { (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
+      ac_try='cc -c conftest.$ac_ext -o conftest.$ac_objext >&5'
+      if { (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); } &&
+	 test -f 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
+	# cc works too.
+	:
+      else
+	# cc exists but doesn't like -o.
+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f conftest*
+
+fi
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_MINUS_C_MINUS_O 1
+_ACEOF
+
+fi
+
+# FIXME: we rely on the cache variable name because
+# there is no other way.
+set dummy $CC
+ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3755,109 +3858,6 @@ else
 fi
 
 
-if test "x$CC" != xcc; then
-  echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6
-else
-  echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6
-fi
-set dummy $CC; ac_cc=`echo $2 |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest.$ac_objext >&5'
-if { (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); } &&
-   test -f 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
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { (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
-      ac_try='cc -c conftest.$ac_ext -o conftest.$ac_objext >&5'
-      if { (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); } &&
-	 test -f 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
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
   { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
@@ -19745,960 +19745,121 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
+case "$host" in
+    mab-next-nextstep3)
+	CC="$CC -arch m68k -arch i486 -arch hppa -arch sparc"
+	;;
+esac
 
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+if test "$GCC" = "yes"; then
+    GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
+    GCCVER2=`echo $GCCVER | awk '{print $1 * 100}'`
+    case "$host" in
+    i386-*-freebsd*)
+	if test $GCCVER2 -lt 300 ; then
+	    echo "ERROR: GCC $GCCVER causes a coredump on $host"
+	    echo "ERROR: Try a more recent GCC version"
+	    sleep 5
+	fi
+	;;
+    esac
+    unset GCCVER
+    unset GCCVER2
 fi
 
+if test -z "$PRESET_CFLAGS"; then
+    if test "$GCC" = "yes"; then
+        case "$host" in
+	*-sun-sunos*)
+    	    # sunos has too many warnings for this to be useful
+	    # motorola too
+    	    ;;
+	*m88k*)
+	    # Motorola cc/ld does not like -02 but is ok on -O
+	    CFLAGS=`echo $CFLAGS | sed -e 's/-O0-9/-O/'`
+	    ;;
+        *)
+    	    CFLAGS="$CFLAGS -Wall"
+    	    ;;
+        esac
+    else
+	case "$host" in
+	*mips-sgi-irix6.*)
+	    # suggested by Rafael Seidl <rafaels@cthulhu.engr.sgi.com>
+	    CFLAGS="$CFLAGS -n32 -mips3 -O3 -OPT:Olimit=0:space=OFF \
+		-woff 1009,1014,1110,1116,1185,1188,1204,1230,1233 \
+		-Wl,-woff,85,-woff,84,-woff,134 \
+		-nostdinc -I/usr/include -D_BSD_SIGNALS"
+	    ;;
+	alpha-dec-osf4.*)
+	    # Mogul says DEC compilers take both -g and -O2
+	    CFLAGS=`echo $CFLAGS | sed -e 's/-g/-g3/'`
+	    CFLAGS="$CFLAGS -O2"
+	    ;;
+	*)
+	    ;;
+	esac
+    fi
 fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
 
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+if test "$GCC" = "yes"; then
+  SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
+  SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  SQUID_CFLAGS=
+  SQUID_CXXFLAGS=
 fi
 
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
 
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
 
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
 
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo "$as_me:$LINENO: checking whether compiler accepts -fhuge-objects" >&5
+echo $ECHO_N "checking whether compiler accepts -fhuge-objects... $ECHO_C" >&6
+  if test "${ac_cv_test_checkforhugeobjects+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
 
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
+    ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
+${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
+res=$?
+rm -f conftest.*
+echo yes
+exit $res`
+    if [ $? -ne 0 ]
+    then ac_cv_test_checkforhugeobjects=no
+    else if [ -z "$ac_cv_test_checkforhugeobjects" ]
+         then ac_cv_test_checkforhugeobjects=yes
+    fi ; fi
 
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
 fi
+ # end of CACHE_VAL
+  echo "$as_me:$LINENO: result: ${ac_cv_test_checkforhugeobjects}" >&5
+echo "${ECHO_T}${ac_cv_test_checkforhugeobjects}" >&6
 
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  if test "X${ac_cv_test_checkforhugeobjects}" != Xno
+  then
+    HUGE_OBJECT_FLAG="-fhuge-objects"
+  else
+    HUGE_OBJECT_FLAG=""
   fi
-done
-done
 
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
+SQUID_CXXFLAGS="$SQUID_CXXFLAGS $HUGE_OBJECT_FLAG"
 
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  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
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  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
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_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
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  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
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  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
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-case "$host" in
-    mab-next-nextstep3)
-	CC="$CC -arch m68k -arch i486 -arch hppa -arch sparc"
-	;;
-esac
-
-if test "$GCC" = "yes"; then
-    GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
-    GCCVER2=`echo $GCCVER | awk '{print $1 * 100}'`
-    case "$host" in
-    i386-*-freebsd*)
-	if test $GCCVER2 -lt 300 ; then
-	    echo "ERROR: GCC $GCCVER causes a coredump on $host"
-	    echo "ERROR: Try a more recent GCC version"
-	    sleep 5
-	fi
-	;;
-    esac
-    unset GCCVER
-    unset GCCVER2
-fi
-
-if test -z "$PRESET_CFLAGS"; then
-    if test "$GCC" = "yes"; then
-        case "$host" in
-	*-sun-sunos*)
-    	    # sunos has too many warnings for this to be useful
-	    # motorola too
-    	    ;;
-	*m88k*)
-	    # Motorola cc/ld does not like -02 but is ok on -O
-	    CFLAGS=`echo $CFLAGS | sed -e 's/-O0-9/-O/'`
-	    ;;
-        *)
-    	    CFLAGS="$CFLAGS -Wall"
-    	    ;;
-        esac
-    else
-	case "$host" in
-	*mips-sgi-irix6.*)
-	    # suggested by Rafael Seidl <rafaels@cthulhu.engr.sgi.com>
-	    CFLAGS="$CFLAGS -n32 -mips3 -O3 -OPT:Olimit=0:space=OFF \
-		-woff 1009,1014,1110,1116,1185,1188,1204,1230,1233 \
-		-Wl,-woff,85,-woff,84,-woff,134 \
-		-nostdinc -I/usr/include -D_BSD_SIGNALS"
-	    ;;
-	alpha-dec-osf4.*)
-	    # Mogul says DEC compilers take both -g and -O2
-	    CFLAGS=`echo $CFLAGS | sed -e 's/-g/-g3/'`
-	    CFLAGS="$CFLAGS -O2"
-	    ;;
-	*)
-	    ;;
-	esac
-    fi
-fi
-
-if test "$GCC" = "yes"; then
-  SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments"
-  SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments"
-else
-  SQUID_CFLAGS=
-  SQUID_CXXFLAGS=
-fi
-
-
-
-
-  echo "$as_me:$LINENO: checking whether compiler accepts -fhuge-objects" >&5
-echo $ECHO_N "checking whether compiler accepts -fhuge-objects... $ECHO_C" >&6
-  if test "${ac_cv_test_checkforhugeobjects+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc
-${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
-res=$?
-rm -f conftest.*
-echo yes
-exit $res`
-    if [ $? -ne 0 ]
-    then ac_cv_test_checkforhugeobjects=no
-    else if [ -z "$ac_cv_test_checkforhugeobjects" ]
-         then ac_cv_test_checkforhugeobjects=yes
-    fi ; fi
-
-fi
- # end of CACHE_VAL
-  echo "$as_me:$LINENO: result: ${ac_cv_test_checkforhugeobjects}" >&5
-echo "${ECHO_T}${ac_cv_test_checkforhugeobjects}" >&6
-
-  if test "X${ac_cv_test_checkforhugeobjects}" != Xno
-  then
-    HUGE_OBJECT_FLAG="-fhuge-objects"
-  else
-    HUGE_OBJECT_FLAG=""
-  fi
-
-SQUID_CXXFLAGS="$SQUID_CXXFLAGS $HUGE_OBJECT_FLAG"
-
-if test -z "$PRESET_LDFLAGS"; then
-    if test "$GCC" = "yes"; then
-        case "$host" in
-        *)
-    	    # nothing
-	    ;;
-        esac
-    else
-	case "$host" in
-	*mips-sgi-irix6.*)
-	    # suggested by Rafael Seidl <rafaels@cthulhu.engr.sgi.com>
-	    LDFLAGS="-n32 -mips3 -nostdlib -L/usr/lib32"
-	    ;;
-	esac
-    fi
+if test -z "$PRESET_LDFLAGS"; then
+    if test "$GCC" = "yes"; then
+        case "$host" in
+        *)
+    	    # nothing
+	    ;;
+        esac
+    else
+	case "$host" in
+	*mips-sgi-irix6.*)
+	    # suggested by Rafael Seidl <rafaels@cthulhu.engr.sgi.com>
+	    LDFLAGS="-n32 -mips3 -nostdlib -L/usr/lib32"
+	    ;;
+	esac
+    fi
 fi
 
 # Check whether --enable-dlmalloc or --disable-dlmalloc was given.
@@ -35573,13 +34734,6 @@ echo "$as_me: error: conditional \"ENABLE_WIN32SPECIFIC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${ENABLE_PINGER_TRUE}" && test -z "${ENABLE_PINGER_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_PINGER\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
diff --git a/lib/cppunit-1.10.0/Makefile.in b/lib/cppunit-1.10.0/Makefile.in
index 3980ed000e..f9888d1123 100644
--- a/lib/cppunit-1.10.0/Makefile.in
+++ b/lib/cppunit-1.10.0/Makefile.in
@@ -46,15 +46,14 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	config/missing config/mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/aclocal.m4 b/lib/cppunit-1.10.0/aclocal.m4
index ae28e6fbdb..853fee9c56 100644
--- a/lib/cppunit-1.10.0/aclocal.m4
+++ b/lib/cppunit-1.10.0/aclocal.m4
@@ -7266,7 +7266,6 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([config/ac_create_prefix_config_h.m4])
 m4_include([config/ac_cxx_have_sstream.m4])
 m4_include([config/ac_cxx_have_strstream.m4])
 m4_include([config/ac_cxx_namespaces.m4])
@@ -7274,4 +7273,5 @@ m4_include([config/ac_cxx_rtti.m4])
 m4_include([config/ac_cxx_string_compare_string_first.m4])
 m4_include([config/ac_dll.m4])
 m4_include([config/ax_cxx_gcc_abi_demangle.m4])
+m4_include([config/ax_prefix_config_h.m4])
 m4_include([config/bb_enable_doxygen.m4])
diff --git a/lib/cppunit-1.10.0/configure b/lib/cppunit-1.10.0/configure
index ec6925eaae..1fa7f4faff 100755
--- a/lib/cppunit-1.10.0/configure
+++ b/lib/cppunit-1.10.0/configure
@@ -20164,9 +20164,15 @@ _ACEOF
 #AC_DEFINE_UNQUOTED(NO_TESTPLUGIN,$testplugin_val,
 #[defined to disable TestPlugIn])
 
-
                                                                                                                                                                                                                                                                     ac_config_files="$ac_config_files Makefile cppunit.spec cppunit-config src/Makefile src/DllPlugInTester/Makefile src/cppunit/Makefile include/Makefile include/cppunit/Makefile include/cppunit/config/Makefile include/cppunit/extensions/Makefile include/cppunit/plugin/Makefile include/cppunit/portability/Makefile include/cppunit/tools/Makefile include/cppunit/ui/Makefile include/cppunit/ui/mfc/Makefile include/cppunit/ui/qt/Makefile include/cppunit/ui/text/Makefile doc/Makefile doc/Doxyfile examples/Makefile examples/simple/Makefile examples/hierarchy/Makefile examples/cppunittest/Makefile examples/ClockerPlugIn/Makefile examples/DumperPlugIn/Makefile examples/money/Makefile"
-          ac_config_commands="$ac_config_commands default"
+
+
+ac_config_headers="$ac_config_headers "
+
+
+          ac_config_commands="$ac_config_commands include/cppunit/config-auto.h"
+
+
 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
@@ -20727,6 +20733,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 #
 
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+PACKAGE="$PACKAGE"
 
 _ACEOF
 
@@ -20764,7 +20771,7 @@ do
   "examples/DumperPlugIn/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/DumperPlugIn/Makefile" ;;
   "examples/money/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/money/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+  "include/cppunit/config-auto.h" ) CONFIG_COMMANDS="$CONFIG_COMMANDS include/cppunit/config-auto.h" ;;
   "config/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config/config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -21175,6 +21182,35 @@ s,@INSTALL@,$ac_INSTALL,;t t
     rm -f $tmp/out
   fi
 
+  # Run the commands associated with the file.
+  case $ac_file in
+    Makefile ) chmod a+x cppunit-config ;;
+    cppunit.spec ) chmod a+x cppunit-config ;;
+    cppunit-config ) chmod a+x cppunit-config ;;
+    src/Makefile ) chmod a+x cppunit-config ;;
+    src/DllPlugInTester/Makefile ) chmod a+x cppunit-config ;;
+    src/cppunit/Makefile ) chmod a+x cppunit-config ;;
+    include/Makefile ) chmod a+x cppunit-config ;;
+    include/cppunit/Makefile ) chmod a+x cppunit-config ;;
+    include/cppunit/config/Makefile ) chmod a+x cppunit-config ;;
+    include/cppunit/extensions/Makefile ) chmod a+x cppunit-config ;;
+    include/cppunit/plugin/Makefile ) chmod a+x cppunit-config ;;
+    include/cppunit/portability/Makefile ) chmod a+x cppunit-config ;;
+    include/cppunit/tools/Makefile ) chmod a+x cppunit-config ;;
+    include/cppunit/ui/Makefile ) chmod a+x cppunit-config ;;
+    include/cppunit/ui/mfc/Makefile ) chmod a+x cppunit-config ;;
+    include/cppunit/ui/qt/Makefile ) chmod a+x cppunit-config ;;
+    include/cppunit/ui/text/Makefile ) chmod a+x cppunit-config ;;
+    doc/Makefile ) chmod a+x cppunit-config ;;
+    doc/Doxyfile ) chmod a+x cppunit-config ;;
+    examples/Makefile ) chmod a+x cppunit-config ;;
+    examples/simple/Makefile ) chmod a+x cppunit-config ;;
+    examples/hierarchy/Makefile ) chmod a+x cppunit-config ;;
+    examples/cppunittest/Makefile ) chmod a+x cppunit-config ;;
+    examples/ClockerPlugIn/Makefile ) chmod a+x cppunit-config ;;
+    examples/DumperPlugIn/Makefile ) chmod a+x cppunit-config ;;
+    examples/money/Makefile ) chmod a+x cppunit-config ;;
+  esac
 done
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -21621,7 +21657,113 @@ echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
   done
 done
  ;;
-    default ) chmod a+x cppunit-config ;;
+    include/cppunit/config-auto.h ) ac_prefix_conf_OUT=`printf '%s\n' include/cppunit/config-auto.h`
+ac_prefix_conf_DEF=`printf '%s\n' _$ac_prefix_conf_OUT | sed -e "y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:" -e "s/[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g"`
+ac_prefix_conf_PKG=`printf '%s\n' $PACKAGE`
+ac_prefix_conf_LOW=`printf '%s\n' _$ac_prefix_conf_PKG | sed -e "y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:"`
+ac_prefix_conf_UPP=`printf '%s\n' $ac_prefix_conf_PKG | sed -e "y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:"  -e "/^[0123456789]/s/^/_/"`
+ac_prefix_conf_INP=`printf '%s\n' "config/config.h" | sed -e 's/ *//'`
+if test ".$ac_prefix_conf_INP" = "."; then
+   for ac_file in : $CONFIG_HEADERS; do test "_$ac_file" = _: && continue
+     case "$ac_file" in
+        *.h) ac_prefix_conf_INP=$ac_file ;;
+        *)
+     esac
+     test ".$ac_prefix_conf_INP" != "." && break
+   done
+fi
+if test ".$ac_prefix_conf_INP" = "."; then
+   case "$ac_prefix_conf_OUT" in
+      */*) ac_prefix_conf_INP=`basename "$ac_prefix_conf_OUT"`
+      ;;
+      *-*) ac_prefix_conf_INP=`printf '%s\n' "$ac_prefix_conf_OUT" | sed -e "s/[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*-//"`
+      ;;
+      *) ac_prefix_conf_INP=config.h
+      ;;
+   esac
+fi
+if test -z "$ac_prefix_conf_PKG" ; then
+   { { echo "$as_me:$LINENO: error: no prefix for _PREFIX_PKG_CONFIG_H" >&5
+echo "$as_me: error: no prefix for _PREFIX_PKG_CONFIG_H" >&2;}
+   { (exit 1); exit 1; }; }
+else
+  if test ! -f "$ac_prefix_conf_INP" ; then if test -f "$srcdir/$ac_prefix_conf_INP" ; then
+     ac_prefix_conf_INP="$srcdir/$ac_prefix_conf_INP"
+  fi fi
+  { echo "$as_me:$LINENO: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
+echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6;}
+  if test -f $ac_prefix_conf_INP ; then
+    printf '%s\n' "s/#undef  *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
+    printf '%s\n' "s/#undef  *\\([abcdefghijklmnopqrstuvwxyz]\\)/#undef $ac_prefix_conf_LOW""_\\1/" >> conftest.prefix
+    printf '%s\n' "s/#define  *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
+    printf '%s\n' "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
+    printf '%s\n' "#endif/" >>conftest.prefix
+    printf '%s\n' "s/#define  *\\([abcdefghijklmnopqrstuvwxyz][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_LOW""_\\1 \\" >> conftest.prefix
+    printf '%s\n' "#define $ac_prefix_conf_LOW""_\\1 \\2 \\" >> conftest.prefix
+    printf '%s\n' "#endif/" >> conftest.prefix
+    # now executing _script on _DEF input to create _OUT output file
+    printf '%s\n' "#ifndef $ac_prefix_conf_DEF"      >$tmp/pconfig.h
+    printf '%s\n' "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
+    printf '%s\n' ' ' >>$tmp/pconfig.h
+    printf '%s\n' /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
+
+    sed -f conftest.prefix $ac_prefix_conf_INP >>$tmp/pconfig.h
+    printf '%s\n' ' ' >>$tmp/pconfig.h
+    printf '%s\n' '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
+    printf '%s\n' "#endif" >>$tmp/pconfig.h
+    if cmp -s $ac_prefix_conf_OUT $tmp/pconfig.h 2>/dev/null; then
+      { echo "$as_me:$LINENO: $ac_prefix_conf_OUT is unchanged" >&5
+echo "$as_me: $ac_prefix_conf_OUT is unchanged" >&6;}
+    else
+      ac_dir=`(dirname "$ac_prefix_conf_OUT") 2>/dev/null ||
+$as_expr X"$ac_prefix_conf_OUT" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_prefix_conf_OUT" : 'X\(//\)[^/]' \| \
+	 X"$ac_prefix_conf_OUT" : 'X\(//\)$' \| \
+	 X"$ac_prefix_conf_OUT" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_prefix_conf_OUT" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+      { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+      rm -f "$ac_prefix_conf_OUT"
+      mv $tmp/pconfig.h "$ac_prefix_conf_OUT"
+    fi
+    cp conftest.prefix _configs.sed
+  else
+    { { echo "$as_me:$LINENO: error: input file $ac_prefix_conf_INP does not exist - skip generating $ac_prefix_conf_OUT" >&5
+echo "$as_me: error: input file $ac_prefix_conf_INP does not exist - skip generating $ac_prefix_conf_OUT" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  rm -f conftest.*
+fi
+ ;;
   esac
 done
 _ACEOF
@@ -21655,64 +21797,3 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
-
-ac_prefix_conf_OUT=`echo include/cppunit/config-auto.h`
-ac_prefix_conf_DEF=`echo _$ac_prefix_conf_OUT | sed -e 'y:abcdefghijklmnopqrstuvwxyz./,-:ABCDEFGHIJKLMNOPQRSTUVWXYZ____:'`
-ac_prefix_conf_PKG=`echo $PACKAGE`
-ac_prefix_conf_LOW=`echo _$ac_prefix_conf_PKG | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:'`
-ac_prefix_conf_UPP=`echo $ac_prefix_conf_PKG | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:'  -e '/^[0-9]/s/^/_/'`
-ac_prefix_conf_INP=`echo config/config.h`
-if test "$ac_prefix_conf_INP" = "_"; then
-   case $ac_prefix_conf_OUT in
-      */*) ac_prefix_conf_INP=`basename $ac_prefix_conf_OUT`
-      ;;
-      *-*) ac_prefix_conf_INP=`echo $ac_prefix_conf_OUT | sed -e 's/[a-zA-Z0-9_]*-//'`
-      ;;
-      *) ac_prefix_conf_INP=config.h
-      ;;
-   esac
-fi
-if test -z "$ac_prefix_conf_PKG" ; then
-   { { echo "$as_me:$LINENO: error: no prefix for _PREFIX_PKG_CONFIG_H" >&5
-echo "$as_me: error: no prefix for _PREFIX_PKG_CONFIG_H" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  echo "$as_me:$LINENO: result: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
-echo "${ECHO_T}creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6
-  if test -f $ac_prefix_conf_INP ; then
-    (dirname /* automatically generated */) 2>/dev/null ||
-$as_expr X/* automatically generated */ : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X/* automatically generated */ : 'X\(//\)[^/]' \| \
-	 X/* automatically generated */ : 'X\(//\)$' \| \
-	 X/* automatically generated */ : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/* automatically generated */ |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'
-    echo '#ifndef '$ac_prefix_conf_DEF >$ac_prefix_conf_OUT
-    echo '#define '$ac_prefix_conf_DEF' 1' >>$ac_prefix_conf_OUT
-    echo ' ' >>$ac_prefix_conf_OUT
-    echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$ac_prefix_conf_OUT
-
-    echo 's/#undef  *\([A-Z_]\)/#undef '$ac_prefix_conf_UPP'_\1/' >conftest.sed
-    echo 's/#undef  *\([a-z]\)/#undef '$ac_prefix_conf_LOW'_\1/' >>conftest.sed
-    echo 's/#define  *\([A-Z_][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_UPP"_\\1 \\" >>conftest.sed
-    echo '#define '$ac_prefix_conf_UPP"_\\1 \\2 \\" >>conftest.sed
-    echo '#endif/' >>conftest.sed
-    echo 's/#define  *\([a-z][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_LOW"_\\1 \\" >>conftest.sed
-    echo '#define '$ac_prefix_conf_LOW"_\\1 \\2 \\" >>conftest.sed
-    echo '#endif/' >>conftest.sed
-    sed -f conftest.sed $ac_prefix_conf_INP >>$ac_prefix_conf_OUT
-    echo ' ' >>$ac_prefix_conf_OUT
-    echo '/*' $ac_prefix_conf_DEF '*/' >>$ac_prefix_conf_OUT
-    echo '#endif' >>$ac_prefix_conf_OUT
-  else
-    { { echo "$as_me:$LINENO: error: input file $ac_prefix_conf_IN does not exist,     skip generating $ac_prefix_conf_OUT" >&5
-echo "$as_me: error: input file $ac_prefix_conf_IN does not exist,     skip generating $ac_prefix_conf_OUT" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  rm -f conftest.*
-fi
diff --git a/lib/cppunit-1.10.0/doc/Makefile.in b/lib/cppunit-1.10.0/doc/Makefile.in
index 55248edae6..67fc7d4e26 100644
--- a/lib/cppunit-1.10.0/doc/Makefile.in
+++ b/lib/cppunit-1.10.0/doc/Makefile.in
@@ -40,15 +40,14 @@ subdir = doc
 DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/examples/ClockerPlugIn/Makefile.in b/lib/cppunit-1.10.0/examples/ClockerPlugIn/Makefile.in
index 6f4037ea55..d59f04f4dd 100644
--- a/lib/cppunit-1.10.0/examples/ClockerPlugIn/Makefile.in
+++ b/lib/cppunit-1.10.0/examples/ClockerPlugIn/Makefile.in
@@ -38,15 +38,14 @@ host_triplet = @host@
 subdir = examples/ClockerPlugIn
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/examples/DumperPlugIn/Makefile.in b/lib/cppunit-1.10.0/examples/DumperPlugIn/Makefile.in
index aab943d37d..9cdbe1c18b 100644
--- a/lib/cppunit-1.10.0/examples/DumperPlugIn/Makefile.in
+++ b/lib/cppunit-1.10.0/examples/DumperPlugIn/Makefile.in
@@ -38,15 +38,14 @@ host_triplet = @host@
 subdir = examples/DumperPlugIn
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/examples/Makefile.in b/lib/cppunit-1.10.0/examples/Makefile.in
index cecb0eaccb..68e1df8d1f 100644
--- a/lib/cppunit-1.10.0/examples/Makefile.in
+++ b/lib/cppunit-1.10.0/examples/Makefile.in
@@ -38,15 +38,14 @@ host_triplet = @host@
 subdir = examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/examples/cppunittest/Makefile.in b/lib/cppunit-1.10.0/examples/cppunittest/Makefile.in
index 260e5ca5f2..315e400b98 100644
--- a/lib/cppunit-1.10.0/examples/cppunittest/Makefile.in
+++ b/lib/cppunit-1.10.0/examples/cppunittest/Makefile.in
@@ -39,15 +39,14 @@ check_PROGRAMS = $(am__EXEEXT_1)
 subdir = examples/cppunittest
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/examples/hierarchy/Makefile.in b/lib/cppunit-1.10.0/examples/hierarchy/Makefile.in
index 96a5b1b58a..1d2b5129ef 100644
--- a/lib/cppunit-1.10.0/examples/hierarchy/Makefile.in
+++ b/lib/cppunit-1.10.0/examples/hierarchy/Makefile.in
@@ -39,15 +39,14 @@ check_PROGRAMS = $(am__EXEEXT_1)
 subdir = examples/hierarchy
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/examples/money/Makefile.in b/lib/cppunit-1.10.0/examples/money/Makefile.in
index 7836b5f95d..f12e34bbcd 100644
--- a/lib/cppunit-1.10.0/examples/money/Makefile.in
+++ b/lib/cppunit-1.10.0/examples/money/Makefile.in
@@ -39,15 +39,14 @@ check_PROGRAMS = $(am__EXEEXT_1)
 subdir = examples/money
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/examples/simple/Makefile.in b/lib/cppunit-1.10.0/examples/simple/Makefile.in
index 869fa1af18..f9af373ec8 100644
--- a/lib/cppunit-1.10.0/examples/simple/Makefile.in
+++ b/lib/cppunit-1.10.0/examples/simple/Makefile.in
@@ -40,15 +40,14 @@ bin_PROGRAMS = simple$(EXEEXT)
 subdir = examples/simple
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/include/Makefile.in b/lib/cppunit-1.10.0/include/Makefile.in
index ddb361b609..69e7b2d33b 100644
--- a/lib/cppunit-1.10.0/include/Makefile.in
+++ b/lib/cppunit-1.10.0/include/Makefile.in
@@ -38,15 +38,14 @@ host_triplet = @host@
 subdir = include
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/include/cppunit/Makefile.in b/lib/cppunit-1.10.0/include/cppunit/Makefile.in
index f538651427..bcde0f7879 100644
--- a/lib/cppunit-1.10.0/include/cppunit/Makefile.in
+++ b/lib/cppunit-1.10.0/include/cppunit/Makefile.in
@@ -40,15 +40,14 @@ subdir = include/cppunit
 DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/include/cppunit/config/Makefile.in b/lib/cppunit-1.10.0/include/cppunit/config/Makefile.in
index a8755037bf..d3d7fa29c1 100644
--- a/lib/cppunit-1.10.0/include/cppunit/config/Makefile.in
+++ b/lib/cppunit-1.10.0/include/cppunit/config/Makefile.in
@@ -40,15 +40,14 @@ subdir = include/cppunit/config
 DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/include/cppunit/extensions/Makefile.in b/lib/cppunit-1.10.0/include/cppunit/extensions/Makefile.in
index c3b659132d..343bbf8d49 100644
--- a/lib/cppunit-1.10.0/include/cppunit/extensions/Makefile.in
+++ b/lib/cppunit-1.10.0/include/cppunit/extensions/Makefile.in
@@ -40,15 +40,14 @@ subdir = include/cppunit/extensions
 DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/include/cppunit/plugin/Makefile.in b/lib/cppunit-1.10.0/include/cppunit/plugin/Makefile.in
index 240c6e1e29..75a23a7a9c 100644
--- a/lib/cppunit-1.10.0/include/cppunit/plugin/Makefile.in
+++ b/lib/cppunit-1.10.0/include/cppunit/plugin/Makefile.in
@@ -40,15 +40,14 @@ subdir = include/cppunit/plugin
 DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/include/cppunit/portability/Makefile.in b/lib/cppunit-1.10.0/include/cppunit/portability/Makefile.in
index 62e8bc0acf..89da262289 100644
--- a/lib/cppunit-1.10.0/include/cppunit/portability/Makefile.in
+++ b/lib/cppunit-1.10.0/include/cppunit/portability/Makefile.in
@@ -40,15 +40,14 @@ subdir = include/cppunit/portability
 DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/include/cppunit/tools/Makefile.in b/lib/cppunit-1.10.0/include/cppunit/tools/Makefile.in
index 72eb926f4a..a31c94e1f4 100644
--- a/lib/cppunit-1.10.0/include/cppunit/tools/Makefile.in
+++ b/lib/cppunit-1.10.0/include/cppunit/tools/Makefile.in
@@ -40,15 +40,14 @@ subdir = include/cppunit/tools
 DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/include/cppunit/ui/Makefile.in b/lib/cppunit-1.10.0/include/cppunit/ui/Makefile.in
index 3336310db3..a8f29023a4 100644
--- a/lib/cppunit-1.10.0/include/cppunit/ui/Makefile.in
+++ b/lib/cppunit-1.10.0/include/cppunit/ui/Makefile.in
@@ -38,15 +38,14 @@ host_triplet = @host@
 subdir = include/cppunit/ui
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/include/cppunit/ui/mfc/Makefile.in b/lib/cppunit-1.10.0/include/cppunit/ui/mfc/Makefile.in
index fbc186713b..7a302bfac9 100644
--- a/lib/cppunit-1.10.0/include/cppunit/ui/mfc/Makefile.in
+++ b/lib/cppunit-1.10.0/include/cppunit/ui/mfc/Makefile.in
@@ -40,15 +40,14 @@ subdir = include/cppunit/ui/mfc
 DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/include/cppunit/ui/qt/Makefile.in b/lib/cppunit-1.10.0/include/cppunit/ui/qt/Makefile.in
index 1202227306..e440cb41ef 100644
--- a/lib/cppunit-1.10.0/include/cppunit/ui/qt/Makefile.in
+++ b/lib/cppunit-1.10.0/include/cppunit/ui/qt/Makefile.in
@@ -40,15 +40,14 @@ subdir = include/cppunit/ui/qt
 DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/include/cppunit/ui/text/Makefile.in b/lib/cppunit-1.10.0/include/cppunit/ui/text/Makefile.in
index 8a0c0e2ebd..37947169ba 100644
--- a/lib/cppunit-1.10.0/include/cppunit/ui/text/Makefile.in
+++ b/lib/cppunit-1.10.0/include/cppunit/ui/text/Makefile.in
@@ -40,15 +40,14 @@ subdir = include/cppunit/ui/text
 DIST_COMMON = $(libcppunitinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/src/DllPlugInTester/Makefile.in b/lib/cppunit-1.10.0/src/DllPlugInTester/Makefile.in
index 59ef7c36df..7e375ccf40 100644
--- a/lib/cppunit-1.10.0/src/DllPlugInTester/Makefile.in
+++ b/lib/cppunit-1.10.0/src/DllPlugInTester/Makefile.in
@@ -41,15 +41,14 @@ check_PROGRAMS = $(am__EXEEXT_1)
 subdir = src/DllPlugInTester
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/src/Makefile.in b/lib/cppunit-1.10.0/src/Makefile.in
index 3dcfe961da..c5c2051f7a 100644
--- a/lib/cppunit-1.10.0/src/Makefile.in
+++ b/lib/cppunit-1.10.0/src/Makefile.in
@@ -38,15 +38,14 @@ host_triplet = @host@
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/lib/cppunit-1.10.0/src/cppunit/Makefile.in b/lib/cppunit-1.10.0/src/cppunit/Makefile.in
index c8ecfce0ff..aa470f722f 100644
--- a/lib/cppunit-1.10.0/src/cppunit/Makefile.in
+++ b/lib/cppunit-1.10.0/src/cppunit/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 #
-# $Id: Makefile.in,v 1.11 2005/11/21 23:55:24 wessels Exp $
+# $Id: Makefile.in,v 1.12 2006/03/22 01:10:55 hno Exp $
 #
 
 srcdir = @srcdir@
@@ -43,15 +43,14 @@ host_triplet = @host@
 subdir = src/cppunit
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/config/ac_create_prefix_config_h.m4 \
-	$(top_srcdir)/config/ac_cxx_have_sstream.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/config/ac_cxx_have_sstream.m4 \
 	$(top_srcdir)/config/ac_cxx_have_strstream.m4 \
 	$(top_srcdir)/config/ac_cxx_namespaces.m4 \
 	$(top_srcdir)/config/ac_cxx_rtti.m4 \
 	$(top_srcdir)/config/ac_cxx_string_compare_string_first.m4 \
 	$(top_srcdir)/config/ac_dll.m4 \
 	$(top_srcdir)/config/ax_cxx_gcc_abi_demangle.m4 \
+	$(top_srcdir)/config/ax_prefix_config_h.m4 \
 	$(top_srcdir)/config/bb_enable_doxygen.m4 \
 	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \