diff options
| author | Simon Josefsson <simon@josefsson.org> | 2009-05-17 10:38:37 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2009-05-17 10:38:37 +0200 |
| commit | 4f155e7109699fdf98683549e48142f018f6546e (patch) | |
| tree | c504369209d9d8814f75e0bc9e395e71a9f81b23 | |
| parent | 4ed17272e4b6f6901cb65f46436a6adddea9f13c (diff) | |
| download | gnutls-4f155e7109699fdf98683549e48142f018f6546e.tar.gz | |
Need to run AC_PROG_CXX unconditionally.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | lib/configure.ac | 4 |
3 files changed, 7 insertions, 4 deletions
@@ -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 2b5b2028f8..4bfe58a7dd 100644 --- 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 b933835837..a8616f86a1 100644 --- 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 |