diff options
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | build/.cvsignore | 1 | ||||
| -rwxr-xr-x | buildconf | 59 | ||||
| -rw-r--r-- | configure.in | 14 |
5 files changed, 37 insertions, 41 deletions
diff --git a/.cvsignore b/.cvsignore index 50ed0dde6..0cb30a052 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,5 @@ Makefile +aclocal.m4 config.cache config.log config.status @@ -1,5 +1,8 @@ Changes with APR b1 + *) Make it easier to replace libtool on OS/2 via aclocal.m4. + [Roy Fielding] + *) Add apr_ipsubnet_create() and apr_ipsubnet_test() for testing whether or not an address is within a subnet. [Jeff Trawick] diff --git a/build/.cvsignore b/build/.cvsignore index 6226c1f67..62437018a 100644 --- a/build/.cvsignore +++ b/build/.cvsignore @@ -1,4 +1,3 @@ -libtool.m4 ltconfig ltmain.sh rules.mk @@ -56,38 +56,43 @@ # buildconf: Build the support scripts needed to compile from a # checked-out version of the source code. -# Verify that the builder has the right config tools installed -# -build/buildcheck.sh || exit 1 - -libtoolize=`build/PrintPath glibtoolize libtoolize` -if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 -fi +osname=`build/config.guess` +case "$osname" in + *os2_emx*) + echo "Using OS/2-specific aplibtool" + cp -f build/os2_libtool.m4 aclocal.m4 + ;; + *) + # Verify that the builder has the right config tools installed + # + build/buildcheck.sh || exit 1 -# Create the libtool helper files -# -# Note: we copy (rather than link) them to simplify distribution. -# Note: APR supplies its own config.guess and config.sub -- we do not -# rely on libtool's versions -# -echo "Copying libtool helper files ..." + libtoolize=`build/PrintPath glibtoolize libtoolize` + if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 + fi -$libtoolize --copy --automake + # Create the libtool helper files + # + # Note: we copy (rather than link) them to simplify distribution. + # Note: APR supplies its own config.guess and config.sub -- we do not + # rely on libtool's versions + # + echo "Copying libtool helper files ..." -ltpath=`dirname $libtoolize` -ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 + $libtoolize --copy --automake -if [ ! -f $ltfile ]; then - echo "$ltfile not found" - exit 1 -fi -cp -f $ltfile build/libtool.m4 + ltpath=`dirname $libtoolize` + ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 -# This is just temporary until people's workspaces are cleared -- remove -# any old aclocal.m4 left over from prior build so it doesn't cause errors. -rm -f aclocal.m4 + if [ ! -f $ltfile ]; then + echo "$ltfile not found" + exit 1 + fi + cp -f $ltfile aclocal.m4 + ;; +esac # # Generate the autoconf header and ./configure diff --git a/configure.in b/configure.in index 01136029c..c475e17d9 100644 --- a/configure.in +++ b/configure.in @@ -15,7 +15,6 @@ sinclude(build/apr_common.m4) sinclude(build/apr_network.m4) sinclude(build/apr_threads.m4) sinclude(build/apr_hints.m4) -sinclude(build/libtool.m4) AC_CANONICAL_SYSTEM echo "Configuring APR library" @@ -79,18 +78,7 @@ dnl dnl prep libtool dnl echo "performing libtool configuration..." - -case "$host_alias" in -*os2*) - # Use a custom made libtool replacement - echo "using aplibtool" - LIBTOOL="$srcdir/build/aplibtool" - gcc -o $LIBTOOL.exe $LIBTOOL.c - ;; -*) - AC_PROG_LIBTOOL - ;; -esac +AC_PROG_LIBTOOL dnl #----------------------------- Checks for compiler flags nl=' |