diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-12-07 22:33:46 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-12-07 22:33:46 +0000 |
| commit | c45d93e698e6217fd8eeb647e1ce6dc59f13e16e (patch) | |
| tree | bc9f541c7064d961918283a7fb0dc3d78f96723e /autogen.sh | |
| parent | 4fa211ef561fda988de687109b9ccb8ab67c6c83 (diff) | |
| download | wireshark-c45d93e698e6217fd8eeb647e1ce6dc59f13e16e.tar.gz | |
Wiretap no longer has its own configure script, so don't do
automake/autoconf stuff on it.
svn path=/trunk/; revision=23796
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 61 |
1 files changed, 24 insertions, 37 deletions
diff --git a/autogen.sh b/autogen.sh index e9b02e414a..90b5e94f1f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -95,43 +95,30 @@ 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. - # 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 - $AUTOMAKE --add-missing --gnu $am_opt || exit 1 - echo $AUTOCONF - $AUTOCONF || exit 1 - ) || exit 1 -done +aclocal_flags=`./aclocal-flags` +aclocalinclude="$ACLOCAL_FLAGS $aclocal_flags"; +echo $ACLOCAL $aclocalinclude +$ACLOCAL $aclocalinclude || exit 1 +# +# 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 +echo $AUTOHEADER +$AUTOHEADER || exit 1 +echo $AUTOMAKE --add-missing --gnu $am_opt +$AUTOMAKE --add-missing --gnu $am_opt || exit 1 +echo $AUTOCONF +$AUTOCONF || exit 1 #./configure "$@" || exit 1 |