summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomasvs@xiph.org>2007-03-05 14:52:46 +0000
committerThomas Vander Stichele <thomasvs@xiph.org>2007-03-05 14:52:46 +0000
commit9b9440d059b12a72122d851cd7c89e05e188b7ba (patch)
treea3d84d9d005224bd6112ced6a6da2f3c202f5ca8
parent083f54322feb6f8526b98712fb4baee07589ffbb (diff)
downloadtremor-9b9440d059b12a72122d851cd7c89e05e188b7ba.tar.gz
fix autotools build by reordering
git-svn-id: https://svn.xiph.org/branches/lowmem-no-byte/Tremor@12651 0101bb08-14d6-0310-b084-bc0e0c8e3800
-rwxr-xr-xautogen.sh12
-rw-r--r--configure.in8
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 2e972f2..bd577ea 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"