mountmgr: Remove the obsolete libhal support.

configure

@@ -700,8 +700,6 @@ SANE_LIBS
 SANE_CFLAGS
 GNUTLS_LIBS
 GNUTLS_CFLAGS
-HAL_LIBS
-HAL_CFLAGS
 DBUS_LIBS
 DBUS_CFLAGS
 INOTIFY_LIBS
@@ -898,7 +896,6 @@ with_gphoto
 with_gnutls
 with_gssapi
 with_gstreamer
-with_hal
 with_inotify
 with_krb5
 with_ldap
@@ -1990,8 +1987,6 @@ INOTIFY_CFLAGS
 INOTIFY_LIBS
 DBUS_CFLAGS
 DBUS_LIBS
-HAL_CFLAGS
-HAL_LIBS
 GNUTLS_CFLAGS
 GNUTLS_LIBS
 SANE_CFLAGS
@@ -2686,7 +2681,6 @@ Optional Packages:
   --without-gnutls        do not use GnuTLS (schannel support)
   --without-gssapi        do not use GSSAPI (Kerberos SSP support)
   --without-gstreamer     do not use GStreamer (codecs support)
-  --without-hal           do not use HAL (dynamic device support)
   --without-inotify       do not use inotify (filesystem change notifications)
   --without-krb5          do not use krb5 (Kerberos)
   --without-ldap          do not use LDAP
@@ -2794,8 +2788,6 @@ Some influential environment variables:
               Linker flags for libinotify, overriding pkg-config
   DBUS_CFLAGS C compiler flags for dbus-1, overriding pkg-config
   DBUS_LIBS   Linker flags for dbus-1, overriding pkg-config
-  HAL_CFLAGS  C compiler flags for hal, overriding pkg-config
-  HAL_LIBS    Linker flags for hal, overriding pkg-config
   GNUTLS_CFLAGS
               C compiler flags for gnutls, overriding pkg-config
   GNUTLS_LIBS Linker flags for gnutls, overriding pkg-config
@@ -4531,13 +4523,6 @@ then :
 fi
 
 
-# Check whether --with-hal was given.
-if test ${with_hal+y}
-then :
-  withval=$with_hal;
-fi
-
-
 # Check whether --with-inotify was given.
 if test ${with_inotify+y}
 then :
@@ -15178,105 +15163,6 @@ esac
 
 fi
 
-if test "x$with_hal" != "xno" -a "x$ac_cv_lib_soname_dbus_1" != x
-then
-    if ${HAL_CFLAGS:+false} :
-then :
-  if test ${PKG_CONFIG+y}
-then :
-  HAL_CFLAGS=`$PKG_CONFIG --cflags hal 2>/dev/null`
-fi
-fi
-
-if ${HAL_LIBS:+false} :
-then :
-  if test ${PKG_CONFIG+y}
-then :
-  HAL_LIBS=`$PKG_CONFIG --libs hal 2>/dev/null`
-fi
-fi
-
-HAL_LIBS=${HAL_LIBS:-"-ldbus-1"}
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: hal cflags: $HAL_CFLAGS" >&5
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: hal libs: $HAL_LIBS" >&5
-ac_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $HAL_CFLAGS"
-ac_fn_c_check_header_compile "$LINENO" "hal/libhal.h" "ac_cv_header_hal_libhal_h" "$ac_includes_default"
-if test "x$ac_cv_header_hal_libhal_h" = xyes
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lhal" >&5
-printf %s "checking for -lhal... " >&6; }
-if test ${ac_cv_lib_soname_hal+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  ac_check_soname_save_LIBS=$LIBS
-LIBS="-lhal $HAL_LIBS $LIBS"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char libhal_ctx_new ();
-int
-main (void)
-{
-return libhal_ctx_new ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  case "$LIBEXT" in
-    dll) ac_cv_lib_soname_hal=`$ac_cv_path_LDD conftest.exe | grep "hal" | sed -e "s/dll.*/dll/"';2,$d'` ;;
-    dylib) ac_cv_lib_soname_hal=`$OTOOL -L conftest$ac_exeext | grep "libhal\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libhal\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    *) ac_cv_lib_soname_hal=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libhal\\.$LIBEXT" | sed -e "s/^.*\\[\\(libhal\\.$LIBEXT[^	 ]*\\)\\].*$/\1/"';2,$d'`
-       if ${ac_cv_lib_soname_hal:+false} :
-then :
-  ac_cv_lib_soname_hal=`$LDD conftest$ac_exeext | grep "libhal\\.$LIBEXT" | sed -e "s/^.*\(libhal\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'`
-fi ;;
-  esac
-else $as_nop
-  ac_cv_lib_soname_hal=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-  LIBS=$ac_check_soname_save_LIBS
-fi
-if ${ac_cv_lib_soname_hal:+false} :
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
-       HAL_CFLAGS=""
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_hal" >&5
-printf "%s\n" "$ac_cv_lib_soname_hal" >&6; }
-
-printf "%s\n" "#define SONAME_LIBHAL \"$ac_cv_lib_soname_hal\"" >>confdefs.h
-
-
-fi
-else $as_nop
-  HAL_CFLAGS=""
-fi
-
-CPPFLAGS=$ac_save_CPPFLAGS
-
-    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 ${notice_platform}development files not found, no legacy dynamic device support." ;;
-  xno) ;;
-  *)   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
     if ${GNUTLS_CFLAGS:+false} :
@@ -23166,8 +23052,6 @@ INOTIFY_CFLAGS = $INOTIFY_CFLAGS
 INOTIFY_LIBS = $INOTIFY_LIBS
 DBUS_CFLAGS = $DBUS_CFLAGS
 DBUS_LIBS = $DBUS_LIBS
-HAL_CFLAGS = $HAL_CFLAGS
-HAL_LIBS = $HAL_LIBS
 GNUTLS_CFLAGS = $GNUTLS_CFLAGS
 GNUTLS_LIBS = $GNUTLS_LIBS
 SANE_CFLAGS = $SANE_CFLAGS

configure.ac

@@ -39,7 +39,6 @@ AC_ARG_WITH(gphoto,    AS_HELP_STRING([--without-gphoto],[do not use gphoto (Dig
 AC_ARG_WITH(gnutls,    AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)]))
 AC_ARG_WITH(gssapi,    AS_HELP_STRING([--without-gssapi],[do not use GSSAPI (Kerberos SSP support)]))
 AC_ARG_WITH(gstreamer, AS_HELP_STRING([--without-gstreamer],[do not use GStreamer (codecs support)]))
-AC_ARG_WITH(hal,       AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
 AC_ARG_WITH(inotify,   AS_HELP_STRING([--without-inotify],[do not use inotify (filesystem change notifications)]))
 AC_ARG_WITH(krb5,      AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)]))
 AC_ARG_WITH(ldap,      AS_HELP_STRING([--without-ldap],[do not use LDAP]),
@@ -1324,18 +1323,6 @@ 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 ****
-if test "x$with_hal" != "xno" -a "x$ac_cv_lib_soname_dbus_1" != x
-then
-    WINE_PACKAGE_FLAGS(HAL,[hal],[-ldbus-1],,,
-        [AC_CHECK_HEADER([hal/libhal.h],
-            [WINE_CHECK_SONAME(hal, libhal_ctx_new,,[HAL_CFLAGS=""],[$HAL_LIBS])],
-            [HAL_CFLAGS=""])])
-    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
-
 dnl **** Check for libgnutls ****
 if test "x$with_gnutls" != "xno"
 then

include/config.h.in

@@ -901,9 +901,6 @@
 /* Define to the soname of the libgssapi_krb5 library. */
 #undef SONAME_LIBGSSAPI_KRB5
 
-/* Define to the soname of the libhal library. */
-#undef SONAME_LIBHAL
-
 /* Define to the soname of the libkrb5 library. */
 #undef SONAME_LIBKRB5