Francois Gouget : configure: Check for HAL and GnuTLS even if pkg-config is not present.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 295a0cddeac23a7024795614320d3a8b6e3bc3d7
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=295a0cddeac23a7024795614320d3a8b6e3bc3d7

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Fri Jan  9 20:22:22 2009 +0100

configure: Check for HAL and GnuTLS even if pkg-config is not present.

---

 configure    |   22 ++++++++++++++--------
 configure.ac |   22 ++++++++++++++--------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index 8bbd1fc..65743ff 100755
--- a/configure
+++ b/configure
@@ -12783,12 +12783,15 @@ fi
 
 HALINCL=""
 
-if test "x$with_hal" != "xno" -a "$PKG_CONFIG" != "false"
+if test "x$with_hal" != "xno"
 then
     ac_save_CPPFLAGS="$CPPFLAGS"
-    ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`"
-    ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`"
-    CPPFLAGS="$CPPFLAGS $ac_hal_cflags"
+    if test "$PKG_CONFIG" != "false"
+    then
+        ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`"
+        ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`"
+        CPPFLAGS="$CPPFLAGS $ac_hal_cflags"
+    fi
 
 
 for ac_header in dbus/dbus.h hal/libhal.h
@@ -13109,12 +13112,15 @@ esac
 fi
 
 
-if test "x$with_gnutls" != "xno" -a "$PKG_CONFIG" != "false"
+if test "x$with_gnutls" != "xno"
 then
     ac_save_CPPFLAGS="$CPPFLAGS"
-    ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`"
-    ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`"
-    CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags"
+    if test "$PKG_CONFIG" != "false"
+    then
+        ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`"
+        ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`"
+        CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags"
+    fi
     if test "${ac_cv_header_gnutls_gnutls_h+set}" = set; then
   { $as_echo "$as_me:$LINENO: checking for gnutls/gnutls.h" >&5
 $as_echo_n "checking for gnutls/gnutls.h... " >&6; }
diff --git a/configure.ac b/configure.ac
index 13530ac..604f331 100644
--- a/configure.ac
+++ b/configure.ac
@@ -912,12 +912,15 @@ WINE_WARNING_WITH(xslt,[test "x$ac_cv_lib_soname_xslt" = "x"],
 
 dnl **** Check for libhal ****
 AC_SUBST(HALINCL,"")
-if test "x$with_hal" != "xno" -a "$PKG_CONFIG" != "false"
+if test "x$with_hal" != "xno"
 then
     ac_save_CPPFLAGS="$CPPFLAGS"
-    ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`"
-    ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`"
-    CPPFLAGS="$CPPFLAGS $ac_hal_cflags"
+    if test "$PKG_CONFIG" != "false"
+    then
+        ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`"
+        ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`"
+        CPPFLAGS="$CPPFLAGS $ac_hal_cflags"
+    fi
     AC_CHECK_HEADERS([dbus/dbus.h hal/libhal.h])
     if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes"
     then
@@ -931,12 +934,15 @@ WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x"],
                  [libhal ${notice_platform}development files not found, no dynamic device support.])
 
 dnl **** Check for libgnutls ****
-if test "x$with_gnutls" != "xno" -a "$PKG_CONFIG" != "false"
+if test "x$with_gnutls" != "xno"
 then
     ac_save_CPPFLAGS="$CPPFLAGS"
-    ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`"
-    ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`"
-    CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags"
+    if test "$PKG_CONFIG" != "false"
+    then
+        ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`"
+        ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`"
+        CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags"
+    fi
     AC_CHECK_HEADER(gnutls/gnutls.h,
         [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[typeof(gnutls_mac_get_key_size) *pfunc;]])],
             [WINE_CHECK_SONAME(gnutls,gnutls_global_init,