Alexandre Julliard : configure: Don' t warn about libhal if we can use an alternative.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Mon Apr 26 06:57:49 2010 -0500

configure: Don't warn about libhal if we can use an alternative.

---

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

diff --git a/configure b/configure
index 783b776..bcc43d8 100755
--- a/configure
+++ b/configure
@@ -9377,7 +9377,7 @@ fi
     fi
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
-if test "x$ac_cv_lib_soname_hal" = "x"; 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." ;;
   xno) ;;
diff --git a/configure.ac b/configure.ac
index 83b3240..71b1f16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1133,7 +1133,7 @@ then
     fi
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
-WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x"],
+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 ****