* Fix configure script not properly replacing CCDEBUG

Makefile.in

@@ -32,8 +32,8 @@ RESPONSESFILE = doc/responses.txt
 # defaults
 CXX = @CCACHE@ @DISTCC@ @CXX@ @STATIC@
 LD = @CXX@ @STATIC@
-CCDEBUG = @CCACHE@ @DISTCC@ @CCDEBUG@ 
-LDDEBUG = @CCDEBUG@
+CCDEBUG = @CCACHE@ @DISTCC@ @CXX@
+LDDEBUG = @CXX@
 STRIP = @STRIP@
 DIFF = @DIFF@
 

autotools/includes/acinclude.m4

@@ -148,17 +148,10 @@ then
   if test -n "$GXX"
   then
     AC_CACHE_CHECK(whether the compiler understands -static, egg_cv_var_ccstatic, [dnl
-      ac_old_CXX="$CXX"
-      CXX="$CXX -static"
       AC_TRY_COMPILE(,, egg_cv_var_ccstatic="yes", egg_cv_var_ccstatic="no")
-      CXX="$ac_old_CXX"
-      
     ])
-    if test "$egg_cv_var_ccstatic" = "yes"
+    if ! test "$egg_cv_var_ccstatic" = "yes"
     then
-      CCDEBUG="$CXX"
-#      CXX="$CXX -static"
-    else
       cat << 'EOF' >&2
 configure: error:
 
@@ -166,9 +159,9 @@ configure: error:
   This compile flag is required for the botpack on this OS.
 
 EOF
-  exit 1
-    fi
+    exit 1
   fi
+fi
 
   STATIC="-static"
 else

configure

@@ -4784,9 +4784,7 @@ $as_echo_n "checking whether the compiler understands -static... " >&6; }
 if test "${egg_cv_var_ccstatic+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-        ac_old_CXX="$CXX"
-      CXX="$CXX -static"
-      cat >conftest.$ac_ext <<_ACEOF
+        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4828,17 +4826,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      CXX="$ac_old_CXX"
-
 
 fi
 { $as_echo "$as_me:$LINENO: result: $egg_cv_var_ccstatic" >&5
 $as_echo "$egg_cv_var_ccstatic" >&6; }
-    if test "$egg_cv_var_ccstatic" = "yes"
+    if ! test "$egg_cv_var_ccstatic" = "yes"
     then
-      CCDEBUG="$CXX"
-#      CXX="$CXX -static"
-    else
       cat << 'EOF' >&2
 configure: error:
 
@@ -4846,9 +4839,9 @@ configure: error:
   This compile flag is required for the botpack on this OS.
 
 EOF
-  exit 1
-    fi
+    exit 1
   fi
+fi
 
   STATIC="-static"
 else