libprelude/master: Cleanup PKG_CHECK_MODULES

commit 171ce0faf72efc2ec156ca51d104aa80c570b51a
Author: Yoann Vandoorselaere <[email protected]>
Date:   Wed Jan 20 17:30:24 2010 +0100

    Cleanup PKG_CHECK_MODULES
    
    Remove not needed PKG_CHECK_EXISTS() call, fixes gnutls-extra header
    check.


========================================

 configure.in |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

========================================

diff --git a/configure.in b/configure.in
index 4d2ad12..6e25748 100644
--- a/configure.in
+++ b/configure.in
@@ -159,9 +159,8 @@ dnl * Check for GnuTLS.                              *
 dnl **************************************************
 GNUTLS_MIN_VERSION=1.0.17
 
-PKG_CHECK_EXISTS(gnutls,
-                 [PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $GNUTLS_MIN_VERSION])],
-                 [AM_PATH_LIBGNUTLS($GNUTLS_MIN_VERSION, [], [AC_MSG_ERROR(libgnutls is required in order to build libprelude.)])])
+PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $GNUTLS_MIN_VERSION], [],
+                  [AM_PATH_LIBGNUTLS($GNUTLS_MIN_VERSION, [], [AC_MSG_ERROR($LIBGNUTLS_PKG_ERRORS)])])
 
 old_LIBS=$LIBS
 old_CPPFLAGS=$CPPFLAGS
@@ -169,7 +168,7 @@ LIBS="$LIBGNUTLS_LIBS"
 CPPFLAGS="$LIBGNUTLS_CFLAGS"
 
 AC_CHECK_HEADER(gnutls/gnutls.h, ,
-                AC_MSG_ERROR("libgnutls development headers are required to build libprelude"))
+                AC_MSG_ERROR("GnuTLS development headers are required to build libprelude"))
 
 dnl
 dnl Recent GnuTLS version moved SRP function from libgnutls-extra to libgnutls
@@ -194,9 +193,8 @@ if test x$srp_available = xno; then
    dnl **************************************************
    dnl * Check for SRP function in GnuTLS extra.        *
    dnl **************************************************
-   PKG_CHECK_EXISTS(gnutls-extra,
-                    [PKG_CHECK_MODULES([LIBGNUTLS_EXTRA], [gnutls-extra >= $GNUTLS_MIN_VERSION], [AC_CHECK_HEADER(gnutls/extra.h, gnutls_extra=yes, gnutls_extra=no)], gnutls_extra=no)],
-                    [AM_PATH_LIBGNUTLS_EXTRA($GNUTLS_MIN_VERSION, [AC_CHECK_HEADER(gnutls/extra.h, gnutls_extra=yes, gnutls_extra=no)], gnutls_extra=no)])
+   PKG_CHECK_MODULES([LIBGNUTLS_EXTRA], [gnutls-extra >= $GNUTLS_MIN_VERSION], [gnutls_extra=yes],
+                     [AM_PATH_LIBGNUTLS_EXTRA($GNUTLS_MIN_VERSION, gnutls_extra=yes, gnutls_extra=no)])
 
    if test x$gnutls_extra = xyes; then
         old_LIBS=$LIBS
@@ -204,7 +202,7 @@ if test x$srp_available = xno; then
         old_CPPFLAGS=$CPPFLAGS
         CPPFLAGS="$LIBGNUTLS_EXTRA_CFLAGS"
 
-        AC_CHECK_LIB(gnutls-extra, gnutls_srp_verifier, srp_available=yes, srp_available=no)
+        AC_CHECK_HEADER(gnutls/extra.h, [AC_CHECK_LIB(gnutls-extra, gnutls_srp_verifier, srp_available=yes, srp_available=no)], srp_available=no)
         if test x$srp_available = xyes; then
                 AC_DEFINE_UNQUOTED(GNUTLS_SRP_ENABLED, , Define whether SRP support is enabled)
                 PRELUDE_ADMIN_CFLAGS="-DNEED_GNUTLS_EXTRA $LIBGNUTLS_EXTRA_CFLAGS"
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog