aboutsummaryrefslogtreecommitdiffstats
path: root/autogen.sh
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2004-05-26 10:41:14 +0000
committerJörg Mayer <jmayer@loplof.de>2004-05-26 10:41:14 +0000
commite7e37d473cf05ce7d03be51f4b524db6c3178e1b (patch)
treefaab1b54a956d3d032406443c2a2464635cffddb /autogen.sh
parent8451fe82d06b8d3b9c0c3f05a042bc1542522c01 (diff)
Run libtoolize after aclocal.m4 has been generated
svn path=/trunk/; revision=11006
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh33
1 files changed, 17 insertions, 16 deletions
diff --git a/autogen.sh b/autogen.sh
index fc45fef..217dd49 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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,21 +87,6 @@ esac
$DIE
-#
-# We do NOT want libtoolize overwriting our versions of config.guess and
-# config.sub, so move them away and then move them back.
-# We don't omit "--force", as we want libtoolize to install other files
-# without whining.
-#
-mv config.guess config.guess.save-libtool
-mv config.sub config.sub.save-libtool
-LTARGS=" --copy --force"
-echo $LIBTOOLIZE $LTARGS
-$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
(
@@ -115,6 +100,22 @@ for dir in . wiretap ; do
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.
+ # We don't omit "--force", as we want libtoolize to install other files
+ # without whining.
+ #
+ mv config.guess config.guess.save-libtool
+ mv config.sub config.sub.save-libtool
+ LTARGS=" --copy --force"
+ echo $LIBTOOLIZE $LTARGS
+ $LIBTOOLIZE $LTARGS || exit 1
+ rm -f config.guess config.sub
+ mv config.guess.save-libtool config.guess
+ mv config.sub.save-libtool config.sub
+ fi
echo $AUTOHEADER
$AUTOHEADER || exit 1
echo $AUTOMAKE --add-missing --gnu $am_opt