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

[Ralph Giles]

giles       00/10/31 09:59:38

  Modified:    .        .cvsignore autogen.sh configure.in
  Log:
  configure cleanups:
  
  call libtoolize to avoid the ltconfig warning
  
  don't call autoheader since we're not using config.h
  
  remove superfluous AC_SUBST(CC) and AC_PROG_RANLIB()
  
  .cvsignore updates for the autogenerated/installed files

Revision  Changes    Path
1.3       +10 -2     ao/.cvsignore

Index: .cvsignore
===================================================================
RCS file: /usr/local/cvsroot/ao/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2000/10/30 16:43:12	1.2
+++ .cvsignore	2000/10/31 17:59:38	1.3
@@ -1,11 +1,19 @@
 *.tar.gz
 ao-config
-Makefile
 config.status
 config.cache
-libtool
 config.log
+config.sub
+config.guess
+libtool
+ltconfig
+ltmain.sh
+install-sh
 configure
+Makefile
 Makefile.in
+config.h
 config.h.in
 aclocal.m4
+mkinstalldirs
+missing

1.2       +21 -7     ao/autogen.sh

Index: autogen.sh
===================================================================
RCS file: /usr/local/cvsroot/ao/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autogen.sh	2000/09/03 09:56:05	1.1
+++ autogen.sh	2000/10/31 17:59:38	1.2
@@ -2,6 +2,8 @@
 # Run this to generate all the initial makefiles, etc.
 # (basically ripped directly from enlightenment's autogen.sh)
 
+package="libao"
+
 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 libao."
+        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 libao."
-        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 libao, 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 -4      ao/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ao/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure.in	2000/10/31 07:15:44	1.6
+++ configure.in	2000/10/31 17:59:38	1.7
@@ -23,10 +23,7 @@
 
 AC_PROG_CC
 AM_PROG_LIBTOOL
-AC_PROG_RANLIB
 
-AC_SUBST(RANLIB)
-
 dnl ====================================
 dnl Set some general compile options
 dnl ====================================
@@ -68,7 +65,6 @@
 fi
 
 
-AC_SUBST(CC)
 AC_SUBST(DEBUG)
 AC_SUBST(PROFILE)
 

--- >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.