diff options
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rwxr-xr-x | autogen.sh | 32 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 23 insertions, 12 deletions
@@ -4,7 +4,6 @@ configure aclocal.m4 config.cache config.guess -config.h.in config.log config.status config.sub @@ -1,6 +1,8 @@ #!/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 @@ DIE=0 (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 @@ DIE=0 (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 @@ if test -z "$*"; then 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" diff --git a/configure.in b/configure.in index 89ef323..03b39f1 100644 --- a/configure.in +++ b/configure.in @@ -224,7 +224,5 @@ AC_SUBST(LIBS) 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) |