---- a/config.mk.in 2009-02-20 13:00:04.000000000 +0300
-+++ b/config.mk.in 2009-02-24 15:26:52.000000000 +0300
-@@ -173,7 +173,7 @@
+--- a/config.mk.in
++++ b/config.mk.in
+@@ -178,7 +178,7 @@ ifeq ($(patsubst linux-gnu%,linux-gnu,$(
shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN))
shliblefn = $(1:%=%.$(SHLIB_SUFFIX))
# SHLIB_CLIB = -lc
--- /dev/null
+--- a/configure.in
++++ b/configure.in
+@@ -230,9 +230,7 @@ dnl Checks for programs.
+ dnl =======================================================================
+
+ AC_PROG_CC
+-if test x"$enable_cplusplus" != xno; then
+- AC_PROG_CXX
+-fi
++AC_PROG_CXX
+
+
+ dnl =======================================================================
---- a/lib/curl_transport/Makefile 2009-02-20 13:00:03.000000000 +0300
-+++ b/lib/curl_transport/Makefile 2009-02-20 16:54:45.000000000 +0300
-@@ -34,6 +34,7 @@
+--- a/lib/curl_transport/Makefile
++++ b/lib/curl_transport/Makefile
+@@ -34,6 +34,7 @@ INCLUDES = \
-I$(BLDDIR)/include \
-I$(SRCDIR)/include \
-I$(SRCDIR)/lib/util/include \