From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 17 Nov 2008 23:10:31 +0000 (+0100)
Subject: Print C++ status.
X-Git-Tag: gnutls_2_7_2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07fc8f24f8ac240796045950d499e2db3cc43b2f;p=thirdparty%2Fgnutls.git

Print C++ status.
---

diff --git a/configure.ac b/configure.ac
index 82529de30b..b07f7afa8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,8 +130,8 @@ if test "$opt_guile_bindings" = "yes"; then
         _gcc_cflags_save="$CFLAGS"
         CFLAGS="${CFLAGS} -fgnu89-inline"
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
-                          _gcc_gnu89_inline=yes, _gcc_gnu89_inline=no)
-        AC_MSG_RESULT($_gcc_gnu89_inline)
+                          gnu89_inline=yes, gnu89_inline=no)
+        AC_MSG_RESULT($gnu89_inline)
         CFLAGS="$_gcc_cflags_save"
       else
         AC_MSG_RESULT([no])
@@ -141,8 +141,7 @@ if test "$opt_guile_bindings" = "yes"; then
    fi
 fi
 AM_CONDITIONAL(HAVE_GUILE, test "$opt_guile_bindings" = "yes")
-AM_CONDITIONAL([HAVE_GCC_GNU89_INLINE_OPTION],
-               [test "$_gcc_gnu89_inline" = "yes"])
+AM_CONDITIONAL(HAVE_GCC_GNU89_INLINE_OPTION, test "$gnu89_inline" = "yes"])
 AM_CONDITIONAL(HAVE_GCC, test "$GCC" = "yes")
 
 dnl Check for libcfg+
@@ -256,4 +255,5 @@ AC_MSG_NOTICE([summary of build options:
   Valgrind:         ${VALGRIND}
   Linker script:    $have_ld_version_script
   Guile wrappers:   $opt_guile_bindings
+  C++ library:      $use_cxx
 ])
diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4
index b07fa2f007..45e62508db 100644
--- a/lib/m4/hooks.m4
+++ b/lib/m4/hooks.m4
@@ -45,8 +45,6 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
     AC_LANG_POP(C++)
   fi
   AM_CONDITIONAL(ENABLE_CXX, test "$use_cxx" != "no")
-  AC_MSG_CHECKING([whether to build C++ library])
-  AC_MSG_RESULT($use_cxx)
 
   AC_LIB_HAVE_LINKFLAGS(gcrypt,, [#include <gcrypt.h>],
     [enum gcry_cipher_algos i = GCRY_CIPHER_CAMELLIA128])