Need to run AC_PROG_CXX unconditionally.

diff --git a/NEWS b/NEWS
index 861a3d1e2c36f78b0de111261f5eb67318a40112..446b2be06e979341d53b2ffd749da4a990469a09 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@ See the end for copying conditions.
 Reported by "Tom G. Christensen" <tgc@jupiterrise.com> in
 <http://permalink.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/3548>.
 
+** libgnutls: Fix build failure with --disable-cxx.
+Reported by Andreas Metzler <ametzler@downhill.at.eu.org> in
+<http://permalink.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/3557>.
+
 ** API and ABI modifications:
 No changes since last version.
 

diff --git a/configure.ac b/configure.ac
index 2b5b2028f89802010f04f8a587dc780aed8a248c..4bfe58a7dd94e7ecf0886090bdba1dee01af7aa3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,11 +50,12 @@ fi
 gl_EARLY
 AC_C_INLINE
 
+# For the C++ code
+AC_PROG_CXX
 AC_ARG_ENABLE(cxx,
   AS_HELP_STRING([--disable-cxx], [unconditionally disable the C++ library]),
     use_cxx=$enableval, use_cxx=yes)
 if test "$use_cxx" != "no"; then
-  AC_PROG_CXX
   AC_LANG_PUSH(C++)
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], use_cxx=yes, use_cxx=no)
   AC_LANG_POP(C++)

diff --git a/lib/configure.ac b/lib/configure.ac
index b933835837f8be6d5cc33857664f6a35f9ba0d9f..a8616f86a1169b67f18a9ba85e09117cc70cd4fb 100644 (file)
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -88,10 +88,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS)
 
 # Finish things from ../configure.ac.
 AC_SUBST([WARN_CFLAGS])
+AC_PROG_CXX
 AM_CONDITIONAL(ENABLE_CXX, test "$use_cxx" != "no")
-if test "$use_cxx" != "no"; then
-  AC_PROG_CXX
-fi
 
 AC_CONFIG_FILES([
   Makefile