[Openvas-commits] r6212 - trunk/openvas-client

[scm-commit@wald.intevation.org]

Author: felix
Date: 2009-12-21 10:26:49 +0100 (Mon, 21 Dec 2009)
New Revision: 6212

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/configure
   trunk/openvas-client/configure.in
Log:
* configure.in: When gnutls is not found, place a hint that it was
searched for using pkg-config (and thus maybe PKG_CONFIG_PATH has to be
altered).

* configure: Regenerated.


Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-12-21 08:58:34 UTC (rev 6211)
+++ trunk/openvas-client/ChangeLog	2009-12-21 09:26:49 UTC (rev 6212)
@@ -1,3 +1,11 @@
+2009-12-21  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
+	* configure.in: When gnutls is not found, place a hint that it was
+	searched for using pkg-config (and thus maybe PKG_CONFIG_PATH has to be
+	altered).
+
+	* configure: Regenerated.
+
 2009-12-18  Michael Wiegand <michael.wiegand at intevation.de>
 
 	Post-release version bump.

Modified: trunk/openvas-client/configure
===================================================================
--- trunk/openvas-client/configure	2009-12-21 08:58:34 UTC (rev 6211)
+++ trunk/openvas-client/configure	2009-12-21 09:26:49 UTC (rev 6212)
@@ -10763,12 +10763,12 @@
 
 	{ 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;}
+                { { echo "$as_me:$LINENO: error: \"gnutls >= 2.4 not found. It was searched for using pkg-config. You might have to adjust PKG_CONFIG_PATH if the library is installed but not found.\"" >&5
+echo "$as_me: error: \"gnutls >= 2.4 not found. It was searched for using pkg-config. You might have to adjust PKG_CONFIG_PATH if the library is installed but 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;}
+	{ { echo "$as_me:$LINENO: error: \"gnutls >= 2.4 not found. It was searched for using pkg-config. You might have to adjust PKG_CONFIG_PATH if the library is installed but not found.\"" >&5
+echo "$as_me: error: \"gnutls >= 2.4 not found. It was searched for using pkg-config. You might have to adjust PKG_CONFIG_PATH if the library is installed but not found.\"" >&2;}
    { (exit 1); exit 1; }; }
 else
 	GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS

Modified: trunk/openvas-client/configure.in
===================================================================
--- trunk/openvas-client/configure.in	2009-12-21 08:58:34 UTC (rev 6211)
+++ trunk/openvas-client/configure.in	2009-12-21 09:26:49 UTC (rev 6212)
@@ -343,7 +343,7 @@
 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"))
+PKG_CHECK_MODULES([GNUTLS], gnutls >= 2.4, HAVE_GNUTLS="yes", AC_MSG_ERROR("gnutls >= 2.4 not found. It was searched for using pkg-config. You might have to adjust PKG_CONFIG_PATH if the library is installed but 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)])