Run libtoolize after aclocal.m4 has been generated

svn path=/trunk/; revision=11006
This commit is contained in:
Jörg Mayer 2004-05-26 10:41:14 +00:00
parent 8451fe82d0
commit e7e37d473c
1 changed files with 17 additions and 16 deletions

View File

@ -2,7 +2,7 @@
#
# Run this to generate all the initial makefiles.
#
# $Id: autogen.sh,v 1.35 2004/05/02 00:43:43 guy Exp $
# $Id: autogen.sh,v 1.36 2004/05/26 10:41:14 jmayer Exp $
DIE=true
PROJECT="Ethereal"
@ -87,6 +87,20 @@ esac
$DIE
for dir in . wiretap ; do
echo processing $dir
(
cd $dir
if [ "$dir" = "." ] ; then
topdir=.
else
topdir=..
fi
aclocal_flags=`$topdir/aclocal-flags`
aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags";
echo $ACLOCAL $aclocalinclude
$ACLOCAL $aclocalinclude || exit 1
if [ "$dir" = "." ] ; then
#
# We do NOT want libtoolize overwriting our versions of config.guess and
# config.sub, so move them away and then move them back.
@ -101,20 +115,7 @@ $LIBTOOLIZE $LTARGS || exit 1
rm -f config.guess config.sub
mv config.guess.save-libtool config.guess
mv config.sub.save-libtool config.sub
for dir in . wiretap ; do
echo processing $dir
(
cd $dir
if [ "$dir" = "." ] ; then
topdir=.
else
topdir=..
fi
aclocal_flags=`$topdir/aclocal-flags`
aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags";
echo $ACLOCAL $aclocalinclude
$ACLOCAL $aclocalinclude || exit 1
echo $AUTOHEADER
$AUTOHEADER || exit 1
echo $AUTOMAKE --add-missing --gnu $am_opt