* Port [3428] to 1.2.14

 * Fix -static problems


svn: 3429

Makefile.in

@@ -24,9 +24,9 @@ REVISION 	:= $(shell misc/getrev.sh)
 BUILDTS 	:= $(shell misc/getts.sh)
 
 # defaults
-CXX = @CCACHE@ @DISTCC@ @CXX@
-LD = @CXX@
-CCDEBUG = @CCACHE@ @DISTCC@ @CCDEBUG@
+CXX = @CCACHE@ @DISTCC@ @CXX@ -static
+LD = @CXX@ -static
+CCDEBUG = @CCACHE@ @DISTCC@ @CCDEBUG@ 
 LDDEBUG = @CCDEBUG@
 STRIP = @STRIP@
 DIFF = @DIFF@

autotools/includes/acinclude.m4

@@ -157,7 +157,7 @@ then
     if test "$egg_cv_var_ccstatic" = "yes"
     then
       CCDEBUG="$CXX"
-      CXX="$CXX -static"
+#      CXX="$CXX -static"
     else
       cat << 'EOF' >&2
 configure: error:

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 3240 .
+# From configure.ac Revision: 3400 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -4446,7 +4446,7 @@ echo "${ECHO_T}$egg_cv_var_ccstatic" >&6; }
     if test "$egg_cv_var_ccstatic" = "yes"
     then
       CCDEBUG="$CXX"
-      CXX="$CXX -static"
+#      CXX="$CXX -static"
     else
       cat << 'EOF' >&2
 configure: error:

src/bdlib/Makefile.in

@@ -5,8 +5,6 @@ srcdir = @srcdir@
 SHELL = @SHELL@
 CXXFLAGS = @CXXFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-LD = @CXX@
 STRIP = @STRIP@
 
 VPATH = @srcdir@

src/compat/Makefile.in

@@ -8,8 +8,6 @@ depcomp = /bin/sh $(top_srcdir)/autotools/depcomp
 
 @SET_MAKE@
 
-CXX = @CXX@
-LD = @CXX@
 STRIP = @STRIP@
 CXXFLAGS = @CXXFLAGS@ -I../.. -I$(top_srcdir) -I$(top_srcdir)/src @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@

src/crypto/Makefile.in

@@ -5,8 +5,6 @@ srcdir = @srcdir@
 SHELL = @SHELL@
 CXXFLAGS = @CXXFLAGS@ -I.. -I$(top_srcdir) -I$(top_srcdir)/pack @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-LD = @CXX@
 STRIP = @STRIP@
 
 VPATH = @srcdir@

src/mod/Makefile.in

@@ -8,8 +8,6 @@ MOD_UPDIR = @MOD_UPDIR@
 
 @SET_MAKE@
 
-CXX = @CXX@
-LD = @CXX@
 STRIP = @STRIP@
 CXXFLAGS = @CXXFLAGS@ -I../.. -I$(top_srcdir) @DEFS@ $(CFLGS)
 CPPFLAGS = @CPPFLAGS@