diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-12-09 21:05:54 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-12-09 21:05:54 +0000 |
| commit | a81a607ed5e3d291940ab75dd82d28d72c222b48 (patch) | |
| tree | d315f4cd627549ce125f837ce16cdc9cf31de2ef | |
| parent | 5cc85c2426a3e387bc9c7c39f1ade5dcadf328e0 (diff) | |
| download | wireshark-a81a607ed5e3d291940ab75dd82d28d72c222b48.tar.gz wireshark-a81a607ed5e3d291940ab75dd82d28d72c222b48.tar.bz2 wireshark-a81a607ed5e3d291940ab75dd82d28d72c222b48.zip | |
Use "--force" with "libtoolize", so it doesn't whine, but save
"config.guess" and "config.sub" vefore running "libtool", and restore
them after running "libtool", so that it doesn't gratuitously "help" us
by installing whatever old versions of those scripts happen to be part
of the version of libtool on the machine.
svn path=/trunk/; revision=4369
| -rwxr-xr-x | autogen.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh index 3cb487ea8d..5b1766db02 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,7 +2,7 @@ # # Run this to generate all the initial makefiles. # -# $Id: autogen.sh,v 1.14 2001/12/09 00:02:44 guy Exp $ +# $Id: autogen.sh,v 1.15 2001/12/09 21:05:54 guy Exp $ DIE=true PROJECT="Ethereal" @@ -69,7 +69,18 @@ esac $DIE -libtoolize --copy || 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 +libtoolize --copy --force || exit 1 +rm -f config.guess config.sub +mv config.guess.save-libtool config.guess +mv config.sub.save-libtool config.sub if test -z "$*"; then echo "Running ./configure with no arguments. If you wish to pass any," |