diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 89 | ||||
| -rw-r--r-- | configure.ac | 1 |
3 files changed, 80 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index e46e20c6..0898d4a3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,4 +2,6 @@ SUBDIRS=src doc tests EXTRA_DIST=autogen.sh SConstruct +ACLOCAL_AMFLAGS = -I m4 + distcleancheck_listfiles = find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';' @@ -1,27 +1,92 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -LIBTOOLIZE=${LIBTOOLIZE:-libtoolize} LIBTOOLIZE_FLAGS="--copy --force" -ACLOCAL=${ACLOCAL:-aclocal} -AUTOHEADER=${AUTOHEADER:-autoheader} -AUTOMAKE=${AUTOMAKE:-automake} -AUTOMAKE_FLAGS="--add-missing --copy" -AUTOCONF=${AUTOCONF:-autoconf} +AUTOMAKE_FLAGS="--add-missing --copy --foreign" ARGV0=$0 - -set -e +ARGS="$@" run() { - echo "$ARGV0: running \`$@'" - $@ + echo "$ARGV0: running \`$@' $ARGS" + $@ $ARGS } +## jump out if one of the programs returns 'false' +set -e + +## on macosx glibtoolize, others have libtool +if test x$LIBTOOLIZE = x; then + if test \! "x`which glibtoolize 2> /dev/null | grep -v '^no'`" = x; then + LIBTOOLIZE=glibtoolize + elif test \! "x`which libtoolize-1.5 2> /dev/null | grep -v '^no'`" = x; then + LIBTOOLIZE=libtoolize-1.5 + elif test \! "x`which libtoolize 2> /dev/null | grep -v '^no'`" = x; then + LIBTOOLIZE=libtoolize + else + echo "libtoolize 1.5.x wasn't found, exiting"; exit 0 + fi +fi + +## suse has aclocal and aclocal-1.9 +if test x$ACLOCAL = x; then + if test \! "x`which aclocal-1.9 2> /dev/null | grep -v '^no'`" = x; then + ACLOCAL=aclocal-1.9 + elif test \! "x`which aclocal19 2> /dev/null | grep -v '^no'`" = x; then + ACLOCAL=aclocal19 + elif test \! "x`which aclocal 2> /dev/null | grep -v '^no'`" = x; then + ACLOCAL=aclocal + else + echo "automake 1.9.x (aclocal) wasn't found, exiting"; exit 0 + fi +fi + +if test x$AUTOMAKE = x; then + if test \! "x`which automake-1.9 2> /dev/null | grep -v '^no'`" = x; then + AUTOMAKE=automake-1.9 + elif test \! "x`which automake19 2> /dev/null | grep -v '^no'`" = x; then + AUTOMAKE=automake19 + elif test \! "x`which automake 2> /dev/null | grep -v '^no'`" = x; then + AUTOMAKE=automake + else + echo "automake 1.9.x wasn't found, exiting"; exit 0 + fi +fi + + +## macosx has autoconf-2.59 and autoconf-2.60 +if test x$AUTOCONF = x; then + if test \! "x`which autoconf-2.59 2> /dev/null | grep -v '^no'`" = x; then + AUTOCONF=autoconf-2.59 + elif test \! "x`which autoconf259 2> /dev/null | grep -v '^no'`" = x; then + AUTOCONF=autoconf259 + elif test \! "x`which autoconf 2> /dev/null | grep -v '^no'`" = x; then + AUTOCONF=autoconf + else + echo "autoconf 2.59+ wasn't found, exiting"; exit 0 + fi +fi + +if test x$AUTOHEADER = x; then + if test \! "x`which autoheader-2.59 2> /dev/null | grep -v '^no'`" = x; then + AUTOHEADER=autoheader-2.59 + elif test \! "x`which autoheader259 2> /dev/null | grep -v '^no'`" = x; then + AUTOHEADER=autoheader259 + elif test \! "x`which autoheader 2> /dev/null | grep -v '^no'`" = x; then + AUTOHEADER=autoheader + else + echo "autoconf 2.59+ (autoheader) wasn't found, exiting"; exit 0 + fi +fi + + run $LIBTOOLIZE $LIBTOOLIZE_FLAGS -run $ACLOCAL $ACLOCAL_FLAGS +run $ACLOCAL $ACLOCAL_FLAGS -I m4 run $AUTOHEADER run $AUTOMAKE $AUTOMAKE_FLAGS run $AUTOCONF -echo "Now type './configure ...' and 'make' to compile." + +if test "$ARGS" = "" ; then + echo "Now type './configure ...' and 'make' to compile." +fi diff --git a/configure.ac b/configure.ac index 246012fa..14457c4d 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,7 @@ AC_PREREQ(2.57) AC_INIT([lighttpd], [1.4.24], [contact@lighttpd.net]) AC_CONFIG_SRCDIR([src/server.c]) AC_CONFIG_HEADER([config.h]) +AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_TARGET |