Skip to content
Snippets Groups Projects
Commit e6382d08 authored by Ralph Giles's avatar Ralph Giles
Browse files

Merge changes from the libogg autogen.sh.

In particular, enable maintainer-mode by default, and use
a more direct test for the proper libtoolize executable
that works on recent MacOS X, whose 'which' doesn't set
an return code like the GNU version.


git-svn-id: http://svn.xiph.org/trunk/ao@9694 0101bb08-14d6-0310-b084-bc0e0c8e3800
parent d83035aa
No related branches found
No related tags found
No related merge requests found
......@@ -73,7 +73,7 @@ fi
echo -n "checking for libtool... "
for LIBTOOLIZE in libtoolize glibtoolize nope; do
(which $LIBTOOLIZE) > /dev/null 2>&1 && break
($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 && break
done
if test x$LIBTOOLIZE = xnope; then
echo "nope."
......@@ -102,15 +102,20 @@ 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 " $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 " autoheader"
#autoheader || exit 1
echo " autoconf"
autoconf
autoconf || exit 1
# this search and replace hack is specifically for MacOSX where automake
# picks up changelog in debian/ because of filesystem
# case-not-quite-sensitivity breaking make distcheck
perl -i -p -e 's/DIST_COMMON = ChangeLog/DIST_COMMON =/g' debian/Makefile.in
cd $olddir
$srcdir/configure "$@" && echo
$srcdir/configure --enable-maintainer-mode "$@" && echo
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment