[xiph-cvs] cvs commit: ogg .cvsignore autogen.sh configure.in

[Ralph Giles]

giles       00/11/03 23:28:35

  Modified:    .        .cvsignore autogen.sh configure.in
  Log:
  forgot to propagate autogen.sh updates

Revision  Changes    Path
1.3       +0 -1      ogg/.cvsignore

Index: .cvsignore
===================================================================
RCS file: /usr/local/cvsroot/ogg/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2000/10/26 21:20:55	1.2
+++ .cvsignore	2000/11/04 07:28:34	1.3
@@ -4,7 +4,6 @@
 aclocal.m4
 config.cache
 config.guess
-config.h.in
 config.log
 config.status
 config.sub

1.2       +23 -9     ogg/autogen.sh

Index: autogen.sh
===================================================================
RCS file: /usr/local/cvsroot/ogg/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autogen.sh	2000/09/03 05:54:27	1.1
+++ autogen.sh	2000/11/04 07:28:34	1.2
@@ -1,7 +1,9 @@
 #!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-# (basically ripped directly from enlightenment's autogen.sh)
+# Run this to set up the build system: configure, makefiles, etc.
+# (based on the version in enlightenment's cvs)
 
+package="libogg"
+
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
@@ -10,7 +12,7 @@
 
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
         echo
-        echo "You must have autoconf installed to compile libogg."
+        echo "You must have autoconf installed to compile $package."
         echo "Download the appropriate package for your distribution,"
         echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
         DIE=1
@@ -18,12 +20,22 @@
 
 (automake --version) < /dev/null > /dev/null 2>&1 || {
         echo
-        echo "You must have automake installed to compile libogg."
-        echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
-        echo "(or a newer version if it is available)"
+        echo "You must have automake installed to compile $package."
+	echo "Download the appropriate package for your system,
+	echo "or get the source from one of the GNU ftp sites"
+	echo "listed in http://www.gnu.org/order/ftp.html"
         DIE=1
 }
 
+(libtool --version) < /dev/null > /dev/null 2>&1 || {
+	echo
+	echo "You must have libtool installed to compile $package."
+	echo "Download the appropriate package for your system,
+	echo "or get the source from one of the GNU ftp sites"
+	echo "listed in http://www.gnu.org/order/ftp.html"
+	DIE=1
+}
+
 if test "$DIE" -eq 1; then
         exit 1
 fi
@@ -33,12 +45,14 @@
         echo "to pass any to it, please specify them on the $0 command line."
 fi
 
-echo "Generating configuration files for libogg, please wait...."
+echo "Generating configuration files for $package, please wait...."
 
 echo "  aclocal $ACLOCAL_FLAGS"
 aclocal $ACLOCAL_FLAGS
-echo "  autoheader"
-autoheader
+#echo "  autoheader"
+#autoheader
+echo "  libtoolize --automake"
+libtoolize --automake
 echo "  automake --add-missing"
 automake --add-missing 
 echo "  autoconf"

1.7       +0 -2      ogg/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ogg/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure.in	2000/10/30 06:52:02	1.6
+++ configure.in	2000/11/04 07:28:34	1.7
@@ -224,7 +224,5 @@
 AC_SUBST(DEBUG)
 AC_SUBST(CFLAGS)
 AC_SUBST(PROFILE)
-AC_SUBST(CC)
-AC_SUBST(RANLIB)
 
 AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ogg/Makefile include/ogg/config_types.h win32/Makefile)

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.