[Openvas-commits] r5930 - trunk/openvas-client
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Nov 23 10:13:37 CET 2009
Author: felix
Date: 2009-11-23 10:13:33 +0100 (Mon, 23 Nov 2009)
New Revision: 5930
Modified:
trunk/openvas-client/ChangeLog
trunk/openvas-client/configure
trunk/openvas-client/configure.in
Log:
Added check for gnutls to configure. Thanks to Stephan Kleine for
spotting this issue. Closes bug #1188 (http://bugs.openvas.org/1188).
* configure.in: Added check for gnutls >= 2.4
* configure: Regenerated.
Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog 2009-11-23 09:02:43 UTC (rev 5929)
+++ trunk/openvas-client/ChangeLog 2009-11-23 09:13:33 UTC (rev 5930)
@@ -1,3 +1,12 @@
+2009-11-23 Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
+ Added check for gnutls to configure. Thanks to Stephan Kleine for
+ spotting this issue. Closes bug #1188 (http://bugs.openvas.org/1188).
+
+ * configure.in: Added check for gnutls >= 2.4
+
+ * configure: Regenerated.
+
2009-11-21 Chandrashekhar B <bchandra at secpod.com>
* openvas/prefs_dialog/prefs_dialog_user.c: Added new function
Modified: trunk/openvas-client/configure
===================================================================
--- trunk/openvas-client/configure 2009-11-23 09:02:43 UTC (rev 5929)
+++ trunk/openvas-client/configure 2009-11-23 09:13:33 UTC (rev 5930)
@@ -685,6 +685,8 @@
X_PRE_LIBS
X_LIBS
X_EXTRA_LIBS
+GNUTLS_CFLAGS
+GNUTLS_LIBS
GTKCONFIG_CFLAGS
GTKCONFIG_LIBS
AR
@@ -737,6 +739,8 @@
GLIB_CFLAGS
GLIB_LIBS
XMKMF
+GNUTLS_CFLAGS
+GNUTLS_LIBS
GTKCONFIG_CFLAGS
GTKCONFIG_LIBS'
@@ -1340,6 +1344,9 @@
GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
GLIB_LIBS linker flags for GLIB, overriding pkg-config
XMKMF Path to xmkmf, Makefile generator for X Window System
+ GNUTLS_CFLAGS
+ C compiler flags for GNUTLS, overriding pkg-config
+ GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config
GTKCONFIG_CFLAGS
C compiler flags for GTKCONFIG, overriding pkg-config
GTKCONFIG_LIBS
@@ -10695,6 +10702,82 @@
fi
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for GNUTLS" >&5
+echo $ECHO_N "checking for GNUTLS... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GNUTLS_CFLAGS"; then
+ pkg_cv_GNUTLS_CFLAGS="$GNUTLS_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.4\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gnutls >= 2.4") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.4" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GNUTLS_LIBS"; then
+ pkg_cv_GNUTLS_LIBS="$GNUTLS_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.4\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gnutls >= 2.4") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.4" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnutls >= 2.4"`
+ else
+ GNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 2.4"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GNUTLS_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ { { echo "$as_me:$LINENO: error: \"gnutls >= 2.4 not found\"" >&5
+echo "$as_me: error: \"gnutls >= 2.4 not found\"" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: \"gnutls >= 2.4 not found\"" >&5
+echo "$as_me: error: \"gnutls >= 2.4 not found\"" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS
+ GNUTLS_LIBS=$pkg_cv_GNUTLS_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ HAVE_GNUTLS="yes"
+fi
+
{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
@@ -12044,6 +12127,8 @@
X_PRE_LIBS!$X_PRE_LIBS$ac_delim
X_LIBS!$X_LIBS$ac_delim
X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+GNUTLS_CFLAGS!$GNUTLS_CFLAGS$ac_delim
+GNUTLS_LIBS!$GNUTLS_LIBS$ac_delim
GTKCONFIG_CFLAGS!$GTKCONFIG_CFLAGS$ac_delim
GTKCONFIG_LIBS!$GTKCONFIG_LIBS$ac_delim
AR!$AR$ac_delim
@@ -12069,8 +12154,6 @@
gtk_flags!$gtk_flags$ac_delim
debug_flags!$debug_flags$ac_delim
omp_flags!$omp_flags$ac_delim
-otp_flags!$otp_flags$ac_delim
-man_openvas_1!$man_openvas_1$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -12112,6 +12195,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+otp_flags!$otp_flags$ac_delim
+man_openvas_1!$man_openvas_1$ac_delim
dl_lib!$dl_lib$ac_delim
gdc_lib!$gdc_lib$ac_delim
client!$client$ac_delim
@@ -12125,7 +12210,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: trunk/openvas-client/configure.in
===================================================================
--- trunk/openvas-client/configure.in 2009-11-23 09:02:43 UTC (rev 5929)
+++ trunk/openvas-client/configure.in 2009-11-23 09:13:33 UTC (rev 5930)
@@ -342,6 +342,9 @@
AC_CHECK_LIB(resolv, inet_aton, AC_DEFINE(HAVE_INET_ATON))
AC_CHECK_LIB(z, compress, , AC_ERROR("libz is needed"))
+dnl Check for GNUTLS
+PKG_CHECK_MODULES([GNUTLS], gnutls >= 2.4, HAVE_GNUTLS="yes", AC_MSG_ERROR("gnutls >= 2.4 not found"))
+
dnl Check for the libraries we may want to use
AC_CHECK_LIB(dl, dlopen, [dl_lib="-ldl" ; AC_DEFINE(HAVE_DL_LIB)])
AC_CHECK_FUNCS(snprintf)
More information about the Openvas-commits
mailing list