From 127017da47e2af94a64328eb87d2f967c4afdc4c Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 20 Dec 2011 10:36:35 +0100 Subject: [eter-2.0.0 02/10] configure: Add a check for libdbus independent from the libhal check. --- configure | 114 +++++++++++++++++++++++++++++++++------------------ configure.ac | 38 ++++++++++++----- include/config.h.in | 9 ++-- 3 files changed, 105 insertions(+), 56 deletions(-) diff --git a/configure b/configure index 40c19c2..b4bcc71 100755 --- a/configure +++ b/configure @@ -649,6 +649,7 @@ SANEINCL sane_devel GNUTLSINCL HALINCL +DBUSINCL XSLTINCL XML2INCL XML2LIBS @@ -787,6 +788,7 @@ with_cms with_coreaudio with_cups with_curses +with_dbus with_fontconfig with_freetype with_gettext @@ -1479,6 +1481,7 @@ Optional Packages: --without-coreaudio do not use the CoreAudio sound support --without-cups do not use CUPS --without-curses do not use (n)curses + --without-dbus do not use DBus (dynamic device support) --without-fontconfig do not use fontconfig --without-freetype do not use the FreeType library --without-gettext do not use gettext @@ -2589,6 +2592,12 @@ if test "${with_curses+set}" = set; then : fi +# Check whether --with-dbus was given. +if test "${with_dbus+set}" = set; then : + withval=$with_dbus; +fi + + # Check whether --with-fontconfig was given. if test "${with_fontconfig+set}" = set; then : withval=$with_fontconfig; if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi @@ -9550,40 +9559,25 @@ This is an error since --with-xslt was requested." "$LINENO" 5 ;; esac fi -HALINCL="" - -if test "x$with_hal" != "xno" +if test "x$with_dbus" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" 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" + ac_dbus_libs="`$PKG_CONFIG --libs dbus-1 2>/dev/null`" + ac_dbus_cflags="`$PKG_CONFIG --cflags dbus-1 2>/dev/null`" + CPPFLAGS="$CPPFLAGS $ac_dbus_cflags" fi - for ac_header in dbus/dbus.h hal/libhal.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus_connection_close in -ldbus-1" >&5 -$as_echo_n "checking for dbus_connection_close in -ldbus-1... " >&6; } -if ${ac_cv_lib_dbus_1_dbus_connection_close+:} false; then : + ac_fn_c_check_header_mongrel "$LINENO" "dbus/dbus.h" "ac_cv_header_dbus_dbus_h" "$ac_includes_default" +if test "x$ac_cv_header_dbus_dbus_h" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ldbus-1" >&5 +$as_echo_n "checking for -ldbus-1... " >&6; } +if ${ac_cv_lib_soname_dbus_1+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldbus-1 $ac_hal_libs $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_soname_save_LIBS=$LIBS +LIBS="-ldbus-1 $ac_dbus_libs $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -9602,17 +9596,57 @@ return dbus_connection_close (); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dbus_1_dbus_connection_close=yes -else - ac_cv_lib_dbus_1_dbus_connection_close=no + case "$LIBEXT" in + dll) ac_cv_lib_soname_dbus_1=`$ac_cv_path_LDD conftest.exe | grep "dbus-1" | sed -e "s/dll.*/dll/"';2,$d'` ;; + dylib) ac_cv_lib_soname_dbus_1=`otool -L conftest$ac_exeext | grep "libdbus-1\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libdbus-1\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_dbus_1=`$ac_cv_path_LDD conftest$ac_exeext | grep "libdbus-1\\.$LIBEXT" | sed -e "s/^.*\(libdbus-1\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;; + esac fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + LIBS=$ac_check_soname_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dbus_1_dbus_connection_close" >&5 -$as_echo "$ac_cv_lib_dbus_1_dbus_connection_close" >&6; } -if test "x$ac_cv_lib_dbus_1_dbus_connection_close" = xyes; then : +if test "x$ac_cv_lib_soname_dbus_1" = "x"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_dbus_1" >&5 +$as_echo "$ac_cv_lib_soname_dbus_1" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBDBUS_1 "$ac_cv_lib_soname_dbus_1" +_ACEOF + + DBUSINCL="$ac_dbus_cflags" + +fi +fi + + + CPPFLAGS="$ac_save_CPPFLAGS" +fi +if test "x$ac_cv_lib_soname_dbus_1" = "x" -a \ + "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"; then : + case "x$with_dbus" in + x) as_fn_append wine_notices "|libdbus ${notice_platform}development files not found, no dynamic device support." ;; + xno) ;; + *) as_fn_error $? "libdbus ${notice_platform}development files not found, no dynamic device support. +This is an error since --with-dbus was requested." "$LINENO" 5 ;; +esac +fi + +if test "x$with_hal" != "xno" -a "x$ac_cv_lib_soname_dbus_1" != x +then + ac_save_CPPFLAGS="$CPPFLAGS" + 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_fn_c_check_header_mongrel "$LINENO" "hal/libhal.h" "ac_cv_header_hal_libhal_h" "$ac_includes_default" +if test "x$ac_cv_header_hal_libhal_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lhal" >&5 $as_echo_n "checking for -lhal... " >&6; } if ${ac_cv_lib_soname_hal+:} false; then : @@ -9662,20 +9696,22 @@ cat >>confdefs.h <<_ACEOF _ACEOF HALINCL="$ac_hal_cflags" + fi fi - fi + CPPFLAGS="$ac_save_CPPFLAGS" -fi -if test "x$ac_cv_lib_soname_hal" = "x" -a "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"; then : + if test "x$ac_cv_lib_soname_hal" = "x" -a \ + "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"; then : case "x$with_hal" in - x) as_fn_append wine_notices "|libhal/libdbus ${notice_platform}development files not found, no dynamic device support." ;; + x) as_fn_append wine_notices "|libhal ${notice_platform}development files not found, no legacy dynamic device support." ;; xno) ;; - *) as_fn_error $? "libhal/libdbus ${notice_platform}development files not found, no dynamic device support. + *) as_fn_error $? "libhal ${notice_platform}development files not found, no legacy dynamic device support. This is an error since --with-hal was requested." "$LINENO" 5 ;; esac fi +fi if test "x$with_gnutls" != "xno" then diff --git a/configure.ac b/configure.ac index d73e161..84ea9e6 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,7 @@ AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the Core AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) AC_ARG_WITH(curses, AS_HELP_STRING([--without-curses],[do not use (n)curses]), [if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi]) +AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)])) AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig]), [if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi]) AC_ARG_WITH(freetype, AS_HELP_STRING([--without-freetype],[do not use the FreeType library])) @@ -1218,9 +1219,27 @@ fi WINE_WARNING_WITH(xslt,[test "x$ac_cv_lib_soname_xslt" = "x"], [libxslt ${notice_platform}development files not found, xslt won't be supported.]) +dnl **** Check for libdbus **** +if test "x$with_dbus" != "xno" +then + ac_save_CPPFLAGS="$CPPFLAGS" + if test "$PKG_CONFIG" != "false" + then + ac_dbus_libs="`$PKG_CONFIG --libs dbus-1 2>/dev/null`" + ac_dbus_cflags="`$PKG_CONFIG --cflags dbus-1 2>/dev/null`" + CPPFLAGS="$CPPFLAGS $ac_dbus_cflags" + fi + AC_CHECK_HEADER([dbus/dbus.h], + [WINE_CHECK_SONAME(dbus-1, dbus_connection_close, + [AC_SUBST(DBUSINCL,"$ac_dbus_cflags")],,[$ac_dbus_libs])]) + CPPFLAGS="$ac_save_CPPFLAGS" +fi +WINE_NOTICE_WITH(dbus,[test "x$ac_cv_lib_soname_dbus_1" = "x" -a \ + "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"], + [libdbus ${notice_platform}development files not found, no dynamic device support.]) + dnl **** Check for libhal **** -AC_SUBST(HALINCL,"") -if test "x$with_hal" != "xno" +if test "x$with_hal" != "xno" -a "x$ac_cv_lib_soname_dbus_1" != x then ac_save_CPPFLAGS="$CPPFLAGS" if test "$PKG_CONFIG" != "false" @@ -1229,17 +1248,14 @@ then 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 - AC_CHECK_LIB(dbus-1, dbus_connection_close, - [WINE_CHECK_SONAME(hal, libhal_ctx_new, - [HALINCL="$ac_hal_cflags"],,[$ac_hal_libs])],,[$ac_hal_libs]) - fi + AC_CHECK_HEADER([hal/libhal.h], + [WINE_CHECK_SONAME(hal, libhal_ctx_new, + [AC_SUBST(HALINCL,"$ac_hal_cflags")],,[$ac_hal_libs])]) CPPFLAGS="$ac_save_CPPFLAGS" + WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x" -a \ + "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"], + [libhal ${notice_platform}development files not found, no legacy dynamic device support.]) fi -WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x" -a "x$ac_cv_header_DiskArbitration_DiskArbitration_h" != "xyes"], - [libhal/libdbus ${notice_platform}development files not found, no dynamic device support.]) dnl **** Check for libgnutls **** if test "x$with_gnutls" != "xno" diff --git a/include/config.h.in b/include/config.h.in index d5c1960..c599f1e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -70,9 +70,6 @@ /* Define if you have the daylight variable */ #undef HAVE_DAYLIGHT -/* Define to 1 if you have the header file. */ -#undef HAVE_DBUS_DBUS_H - /* Define to 1 if you have the header file. */ #undef HAVE_DIRECT_H @@ -251,9 +248,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_GSM_H -/* Define to 1 if you have the header file. */ -#undef HAVE_HAL_LIBHAL_H - /* Define to 1 if you have the header file. */ #undef HAVE_IEEEFP_H @@ -1226,6 +1220,9 @@ /* Define to the soname of the libcurses library. */ #undef SONAME_LIBCURSES +/* Define to the soname of the libdbus-1 library. */ +#undef SONAME_LIBDBUS_1 + /* Define to the soname of the libfontconfig library. */ #undef SONAME_LIBFONTCONFIG -- 1.7.9.7