From 600c0db18ca80511e08ac0d07278ddba164620da Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 5 Mar 2007 14:51:41 +0000 Subject: fix autotools build by reordering git-svn-id: https://svn.xiph.org/branches/lowmem-branch/Tremor@12650 0101bb08-14d6-0310-b084-bc0e0c8e3800 --- autogen.sh | 12 ++++++------ configure.in | 8 ++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/autogen.sh b/autogen.sh index 9bdbbf3..e2e6f6b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -48,14 +48,14 @@ fi echo "Generating configuration files for $package, please wait...." echo " aclocal $ACLOCAL_FLAGS" -aclocal $ACLOCAL_FLAGS -#echo " autoheader" -#autoheader +aclocal $ACLOCAL_FLAGS || exit 1 +echo " autoheader" +autoheader || exit 1 echo " libtoolize --automake" -libtoolize --automake +libtoolize --automake || exit 1 echo " automake --add-missing $AUTOMAKE_FLAGS" -automake --add-missing $AUTOMAKE_FLAGS +automake --add-missing $AUTOMAKE_FLAGS || exit 1 echo " autoconf" -autoconf +autoconf || exit 1 $srcdir/configure "$@" && echo diff --git a/configure.in b/configure.in index d871da1..8b961f2 100644 --- a/configure.in +++ b/configure.in @@ -5,6 +5,12 @@ dnl Initialization and Versioning dnl ------------------------------------------------ AC_INIT(mdct.c) + +AC_CANONICAL_HOST +AC_CANONICAL_TARGET + +AM_CONFIG_HEADER([config.h]) + AM_INIT_AUTOMAKE(libvorbisidec,1.2.0) dnl Library versioning @@ -33,8 +39,6 @@ dnl -------------------------------------------------- dnl Set build flags based on environment dnl -------------------------------------------------- -AC_CANONICAL_HOST - dnl Set some target options cflags_save="$CFLAGS" -- cgit v1.2.1