[Liboss-commit] CVS: liboss autogen.sh,1.4,1.5 liboss.info.in,1.5,1.6

[Alexander S. <mrv...@us...>]

Update of /cvsroot/liboss/liboss
In directory sc8-pr-cvs1:/tmp/cvs-serv27679

Modified Files:
	autogen.sh liboss.info.in 
Log Message:
Better version of autogen.sh

Index: autogen.sh
===================================================================
RCS file: /cvsroot/liboss/liboss/autogen.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- autogen.sh	5 Nov 2002 16:23:11 -0000	1.4
+++ autogen.sh	22 Feb 2003 19:42:33 -0000	1.5
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 # This was lifted from the Gimp, and adapted slightly by
-# Raph Levien, slightly hacked for xine by Daniel Caujolle-Bert.
+# Raph Levien, slightly hacked for xine by Daniel Caujolle-Bert, and modified more for OS X by Jeremy Parsons and Alexander Strange.
 
 DIE=0
 
@@ -22,7 +22,7 @@
         DIE=1
 }
 
-(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
+(glibtoolize --version) < /dev/null > /dev/null 2>&1 || (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
         echo
         echo "You must have libtool installed to compile $PROG."
         echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.4.tar.gz"
@@ -56,7 +56,7 @@
     aclocal $aclocalinclude; \
  echo "done.") && \
 (echo $_echo_n " + Running libtoolize: $_echo_c"; \
-    libtoolize --force --copy >/dev/null 2>&1; \
+    libtoolize --force --copy >/dev/null 2>&1 || glibtoolize --force --copy >/dev/null 2>&1; \
  echo "done.") && \
 (echo $_echo_n " + Running autoheader: $_echo_c"; \
     autoheader; \

Index: liboss.info.in
===================================================================
RCS file: /cvsroot/liboss/liboss/liboss.info.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- liboss.info.in	22 Feb 2003 04:32:39 -0000	1.5
+++ liboss.info.in	22 Feb 2003 19:42:33 -0000	1.6
@@ -10,7 +10,7 @@
   Package: %N-shlibs
   Files: lib/%N.*.dylib
   Depends: esound-shlibs
-<<
+ <<
 DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 Description: OSS Audio API Emulation Library
 DescDetail: <<