X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=1502e7d0c87fb7789624839139265b4fad9b377b;hb=b1e57e2a4e258dca9a274c9593773737983767da;hp=81ae4fd35514dc063d7f523acad38fca4733ef5e;hpb=a7cfd908fb371302e311b5d5267498849b3ce2db;p=vlc

diff --git a/configure.ac b/configure.ac
index 81ae4fd355..1502e7d0c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,9 @@ dnl them. And we need the comma otherwize automake will choke on it.
 AM_INIT_AUTOMAKE(vlc,0.8.4-svn)
 AM_CONFIG_HEADER(config.h)
 
+dnl HA! HA!
+AM_MAINTAINER_MODE
+
 dnl
 dnl  Save *FLAGS
 dnl
@@ -200,7 +203,13 @@ case "${target_os}" in
     VLC_ADD_CXXFLAGS([beos],[])
     VLC_ADD_LDFLAGS([vlc beos],[-lbe])
     VLC_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame])
-    VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc],[-lnet])
+
+    dnl Check for BONE
+    if test -f /boot/beos/system/lib/libbind.so; then
+        VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc],[-lbind -lsocket])
+    else
+        VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc],[-lnet])
+    fi
 
     dnl Ugly check for Zeta
     if test -f /boot/beos/system/lib/libzeta.so; then
@@ -709,7 +718,7 @@ dnl Check for hal
 AC_ARG_ENABLE(hal,
   [  --enable-hal            Linux HAL services discovery (default enabled)])
  
-if test "${enable_hal}" != "no"
+if test "${enable_hal}" != "no" -a "${SYS}" = "linux"
 then
   PKG_CHECK_MODULES(HAL, hal >= 0.2.97,
     [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library])
@@ -1035,7 +1044,10 @@ fi
 dnl
 dnl  Accelerated modules
 dnl
-MMX_MODULES="memcpymmx i420_rgb_mmx i422_yuy2_mmx i420_ymga_mmx"
+MMX_MODULES="memcpymmx i422_yuy2_mmx i420_ymga_mmx"
+if test "${target_cpu}" != "x86_64"; then
+  MMX_MODULES="${MMX_MODULES} i420_rgb_mmx"
+fi
 #MMX_MODULES="${MMX_MODULES} idctmmx motionmmx"
 MMXEXT_MODULES="memcpymmxext"
 #MMXEXT_MODULES="${MMXEXT_MODULES} idctmmxext motionmmxext"