configure.ac : added needed linking flags for BeOS/Zeta

 Makefile.am : cleaned make packages-beos

diff --git a/Makefile.am b/Makefile.am
index 898f51649292d2a568e8db3482afd14a5519d562..5542a158364a216ae728dc1698e78c6efe6c27ac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -524,7 +524,7 @@ package-beos:
        mkdir -p $(srcdir)/tmp/vlc
        cd $(srcdir) && \
          cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
-# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell...
+# We cannot use ${PLUGIN_FILES} as it looks like it is too "long" for the BeOS shell...
        if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
          mkdir -p $(srcdir)/tmp/vlc/plugins; \
          find $(srcdir)/modules -name "lib*_plugin.so" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \
@@ -533,7 +533,6 @@ package-beos:
          mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \
          cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
        done
-       mkdir -p $(srcdir)/tmp/vlc/share
 
 # Create package with debug symbols
        mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
@@ -542,12 +541,14 @@ package-beos:
        mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/
 
 # Create package without debug symbols
-       strip $(srcdir)/tmp/vlc-${VERSION}/vlc
-       if [ -d $(srcdir)/tmp/vlc-${VERSION}/plugins ]; then \
-         strip $(srcdir)/tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \
+       mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc
+       strip $(srcdir)/tmp/vlc/vlc
+       if [ -d $(srcdir)/tmp/vlc/plugins ]; then \
+         strip $(srcdir)/tmp/vlc/plugins/lib*_plugin.so; \
        fi
-       xres -o $(srcdir)/tmp/vlc-${VERSION}/vlc $(srcdir)/share/vlc_beos.rsrc
-       mimeset -f $(srcdir)/tmp/vlc-${VERSION}/* $(srcdir)/tmp/vlc-${VERSION}/*/*
+       xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc
+       mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
+       mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION}
        (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
        mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/
 

diff --git a/configure.ac b/configure.ac
index dba950db06fbd08f0db3464862080faa8b19644c..df60b2c41a4b146f64037d053c27935f90f94053 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.52 2003/08/02 14:06:22 gbazin Exp $
+dnl $Id: configure.ac,v 1.53 2003/08/03 13:49:37 titer Exp $
 
 AC_INIT(vlc,0.6.2-cvs)
 
@@ -138,9 +138,13 @@ case "${target_os}" in
     AX_ADD_LDFLAGS([vlc beos],[-lbe])
     AX_ADD_CXXFLAGS([beos],[])
     AX_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame])
-    dnl Check if we have BONE (old net_server doesn't have libsocket.so)
+
+    dnl Check for BONE presence
     AC_CHECK_LIB(socket, connect,
         AX_ADD_LDFLAGS([vlc access_mms ipv4 httpd],[-lsocket -lbind]))
+
+    dnl Check for Zeta
+    AC_CHECK_LIB(zeta, find_directory_r, AX_ADD_LDFLAGS([vlc beos],[-lzeta]))
     ;;
   *)
     SYS="${target_os}"