diff options
| -rwxr-xr-x | autogen.sh | 42 | ||||
| -rwxr-xr-x | bootstrap.sh | 24 |
2 files changed, 21 insertions, 45 deletions
diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 0e9d52a5..00000000 --- a/autogen.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# autogen.sh glue for fetchmail -# $Id: autogen.sh,v 1.1 2001/05/12 08:03:50 esr Exp $ -# -set -e - -# -# Refresh GNU gettext, but do not allow symlinks -# -rm -f po/Makefile.in.in po/ChangeLog po/ChangeLog~ || true -gettextize -c -f || true - -# The idea is that we make sure we're always using an up-to-date -# version of all the auto* script chain for the build. The GNU autotools -# are rather badly designed in that area. - -aclocal -autoheader -#automake --verbose --foreign --add-missing - -#we don't use symlinks because of debian's build system, -#but they would be a better choice. -for i in config.guess config.sub missing install-sh mkinstalldirs ; do - test -r /usr/share/automake/${i} && cp -f /usr/share/automake/${i} . - chmod 755 ${i} -done - -autoconf - -# -# For the Debian build, refresh list of +x scripts, to avoid -# possible breakage if upstream tarball does not include the file -# or if it is mispackaged for whatever reason -# - -test -d debian && { - rm -f debian/executable.files - find -type f -perm +111 ! -name '.*' -fprint debian/executable.files -} - -exit 0 diff --git a/bootstrap.sh b/bootstrap.sh index 4503c596..4202e5ee 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -10,10 +10,28 @@ test -f fetchmail.c test -f Makefile.am rm -rf autom4te.cache echo -echo "Please stand by while generating files with autoreconf, this may" -echo "take a minute or two..." +echo "Please stand by while generating files," +echo "this may take a minute or two..." echo -autoreconf -isv +# Original autogen.sh: +#rm -f po/Makefile.in.in po/ChangeLog po/ChangeLog~ || true +#gettextize -c -f || true + +# do not use -s here, Eric S. Raymond (ESR) writes they don't +# work well in Debian's build system +autoreconf -iv + +# Taken from ESR's autgen.sh: +# +# For the Debian build, refresh list of +x scripts, to avoid +# possible breakage if upstream tarball does not include the file +# or if it is mispackaged for whatever reason +# +test -d debian && { + rm -f debian/executable.files + find -type f -perm +111 ! -name '.*' -fprint debian/executable.files +} + echo echo "You can now run ./configure and make as usual. See INSTALL for details." echo |