forked from pool/gnutls
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
commit 6d9c52778b359c35cfe157156d27915227e59c5e
|
|
Author: Simon Josefsson <simon@josefsson.org>
|
|
Date: Thu Jun 19 13:48:53 2008 +0200
|
|
|
|
Disable C++ library if psk, srp, anon etc have been disabled.
|
|
The libgnutlsxx.cpp file calls several functions that may have been removed.
|
|
|
|
Index: gnutls-2.4.1/configure.in
|
|
===================================================================
|
|
--- gnutls-2.4.1.orig/configure.in 2008-07-02 19:35:02.000000000 +0200
|
|
+++ gnutls-2.4.1/configure.in 2008-07-02 19:39:42.000000000 +0200
|
|
@@ -113,9 +113,6 @@ if test "$use_cxx" != "no"; then
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], use_cxx=yes, use_cxx=no)
|
|
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_MSG_CHECKING([whether C99 macros are supported])
|
|
AC_TRY_COMPILE(,[
|
|
@@ -524,6 +521,17 @@ AC_MSG_RESULT($minitasn1_enabled)
|
|
|
|
AM_CONDITIONAL(ENABLE_MINITASN1, test "$minitasn1_enabled" = "yes")
|
|
|
|
+if test "$ac_full" != 1; then
|
|
+ AC_MSG_WARN([[
|
|
+***
|
|
+*** C++ library disabled because some parts of GnuTLS has been disabled.
|
|
+]])
|
|
+ use_cxx=no
|
|
+fi
|
|
+AM_CONDITIONAL(ENABLE_CXX, test "$use_cxx" != "no")
|
|
+AC_MSG_CHECKING([whether to build C++ library])
|
|
+AC_MSG_RESULT($use_cxx)
|
|
+
|
|
dnl Check for libcfg+
|
|
|
|
SAVED_LIBS=$LIBS
|