Fixed build on BeOS R5/BONE and Zeta

diff --git a/configure.ac b/configure.ac
index a36ec471994fba32c7ccc6818289992fab32d8fb..7cb365cd42be71c3864ad599ad08b31487c866c5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -200,7 +200,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

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index cbbc0119ce8b2cb74008580af63b62fc2837381e..6fbb304505211eafeec05a458093b45d6c3de1b8 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -62,7 +62,11 @@ case $HOST in
 #          echo "EXTRA_LDFLAGS = -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" >> config.mak
         ;;
     i586-pc-beos)
-           echo "EXTRA_LDFLAGS = -lnet" >> config.mak
+            if test -f /boot/beos/system/lib/libbind.so; then
+                echo "EXTRA_LDFLAGS = -lbind -lsocket" >> config.mak
+            else
+                echo "EXTRA_LDFLAGS = -lnet" >> config.mak
+            fi
         ;;
     *)
         ;;