configure.ac: added --disable/enable-hal

 Makefile.am: in package-beos, use $(STRIP) instead of strip since we
   might be cross-compiling

diff --git a/Makefile.am b/Makefile.am
index 30a2f61b24643fcf611c071e06a23d902f82b994..0f930e6c6565e60a1a9fe051132df90c3fb10dd2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -747,8 +747,8 @@ package-beos:
        mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ;
 
 # Create normal package
-       strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ;
-       find $(srcdir)/tmp/vlc -name 'lib*.so' -exec strip \
+       $(STRIP) --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ;
+       find $(srcdir)/tmp/vlc -name 'lib*.so' -exec $(STRIP) \
          --strip-debug --strip-unneeded "{}" \; ;
        xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
        find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;

diff --git a/configure.ac b/configure.ac
index 72397dd173bfdc373faa8d6144da301770c23deb..f4decd50bb7dd5c93a128532e9c0721216b118a1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -700,12 +700,18 @@ if test "${x_libraries}" = "NONE"; then
 fi
 
 dnl Check for hal
-PKG_CHECK_MODULES(HAL, hal >= 0.2.97,
-  [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library])
-   VLC_ADD_PLUGINS([hal])
-   VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS])
-   VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])],
-  [AC_MSG_WARN(HAL library not found)])
+AC_ARG_ENABLE(hal,
+  [  --enable-hal            Linux HAL services discovery (default enabled)])
+ 
+if test "${enable_hal}" != "no"
+then
+  PKG_CHECK_MODULES(HAL, hal >= 0.2.97,
+    [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library])
+     VLC_ADD_PLUGINS([hal])
+     VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS])
+     VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])],
+    [AC_MSG_WARN(HAL library not found)])
+fi
 
 dnl Build the gtk_main plugins?
 NEED_GTK_MAIN=no