ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Francois Gouget 2009-01-09 20:22:22 +01:00 committed by Alexandre Julliard
parent cfd1a6317d
commit 295a0cddea
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure vendored
View File

@ -12783,12 +12783,15 @@ fi
HALINCL="" HALINCL=""
if test "x$with_hal" != "xno" -a "$PKG_CONFIG" != "false" if test "x$with_hal" != "xno"
then then
ac_save_CPPFLAGS="$CPPFLAGS" ac_save_CPPFLAGS="$CPPFLAGS"
ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`" if test "$PKG_CONFIG" != "false"
ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`" then
CPPFLAGS="$CPPFLAGS $ac_hal_cflags" 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 for ac_header in dbus/dbus.h hal/libhal.h
@ -13109,12 +13112,15 @@ esac
fi fi
if test "x$with_gnutls" != "xno" -a "$PKG_CONFIG" != "false" if test "x$with_gnutls" != "xno"
then then
ac_save_CPPFLAGS="$CPPFLAGS" ac_save_CPPFLAGS="$CPPFLAGS"
ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`" if test "$PKG_CONFIG" != "false"
ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`" then
CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags" 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 if test "${ac_cv_header_gnutls_gnutls_h+set}" = set; then
{ $as_echo "$as_me:$LINENO: checking for gnutls/gnutls.h" >&5 { $as_echo "$as_me:$LINENO: checking for gnutls/gnutls.h" >&5
$as_echo_n "checking for gnutls/gnutls.h... " >&6; } $as_echo_n "checking for gnutls/gnutls.h... " >&6; }

22
configure.ac
View File

@ -912,12 +912,15 @@ WINE_WARNING_WITH(xslt,[test "x$ac_cv_lib_soname_xslt" = "x"],
dnl **** Check for libhal **** dnl **** Check for libhal ****
AC_SUBST(HALINCL,"") AC_SUBST(HALINCL,"")
if test "x$with_hal" != "xno" -a "$PKG_CONFIG" != "false" if test "x$with_hal" != "xno"
then then
ac_save_CPPFLAGS="$CPPFLAGS" ac_save_CPPFLAGS="$CPPFLAGS"
ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`" if test "$PKG_CONFIG" != "false"
ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`" then
CPPFLAGS="$CPPFLAGS $ac_hal_cflags" 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]) 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" if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes"
then 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.]) [libhal ${notice_platform}development files not found, no dynamic device support.])
dnl **** Check for libgnutls **** dnl **** Check for libgnutls ****
if test "x$with_gnutls" != "xno" -a "$PKG_CONFIG" != "false" if test "x$with_gnutls" != "xno"
then then
ac_save_CPPFLAGS="$CPPFLAGS" ac_save_CPPFLAGS="$CPPFLAGS"
ac_gnutls_libs="`$PKG_CONFIG --libs gnutls 2>/dev/null`" if test "$PKG_CONFIG" != "false"
ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`" then
CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags" 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_CHECK_HEADER(gnutls/gnutls.h,
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[typeof(gnutls_mac_get_key_size) *pfunc;]])], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[typeof(gnutls_mac_get_key_size) *pfunc;]])],
[WINE_CHECK_SONAME(gnutls,gnutls_global_init, [WINE_CHECK_SONAME(gnutls,gnutls_global_init,