[xiph-commits] r8767 - trunk/vorbis

[ozone at motherfish-iii.xiph.org]

Author: ozone
Date: 2005-01-17 22:26:22 -0800 (Mon, 17 Jan 2005)
New Revision: 8767

Modified:
   trunk/vorbis/autogen.sh
   trunk/vorbis/configure.in
Log:
vorbis:
 * Use autoheader and config.h.in again (basically revert changeset:8766)
 * Use 'type' shell builtin instead of 'which' to locate libtoolize, since it's more portable and less prone to different behaviour



Modified: trunk/vorbis/autogen.sh
===================================================================
--- trunk/vorbis/autogen.sh	2005-01-17 08:13:45 UTC (rev 8766)
+++ trunk/vorbis/autogen.sh	2005-01-18 06:26:22 UTC (rev 8767)
@@ -32,7 +32,7 @@
 
 echo -n "checking for libtool... "
 for LIBTOOLIZE in libtoolize glibtoolize nope; do
-  (which $LIBTOOLIZE) > /dev/null 2>&1 && break
+  (type $LIBTOOLIZE) > /dev/null 2>&1 && break
 done
 if test x$LIBTOOLIZE = xnope; then
   echo "nope."
@@ -62,6 +62,8 @@
 
 echo "  aclocal $ACLOCAL_FLAGS"
 aclocal $ACLOCAL_FLAGS || exit 1
+echo "  autoheader"
+autoheader || exit 1
 echo "  $LIBTOOLIZE --automake"
 $LIBTOOLIZE --automake || exit 1
 echo "  automake --add-missing $AUTOMAKE_FLAGS"

Modified: trunk/vorbis/configure.in
===================================================================
--- trunk/vorbis/configure.in	2005-01-17 08:13:45 UTC (rev 8766)
+++ trunk/vorbis/configure.in	2005-01-18 06:26:22 UTC (rev 8767)
@@ -9,6 +9,8 @@
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
+AM_CONFIG_HEADER([config.h])
+
 AM_INIT_AUTOMAKE(libvorbis,1.1.0)
 AM_MAINTAINER_MODE