Revert last change -- I forgot that buildconf is run before we create

a release tarball, so it can't be OS-specific.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@61399 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 41 insertions, 37 deletions

diff --git a/.cvsignore b/.cvsignore
index 0cb30a052..50ed0dde6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,4 @@
 Makefile
-aclocal.m4
 config.cache
 config.log
 config.status
diff --git a/CHANGES b/CHANGES
index 958bb907d..0e256569f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,5 @@
 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 62437018a..6226c1f67 100644
--- a/build/.cvsignore
+++ b/build/.cvsignore
@@ -1,3 +1,4 @@
+libtool.m4
 ltconfig
 ltmain.sh
 rules.mk
diff --git a/buildconf b/buildconf
index 9f867997b..06e0f3f9f 100755
--- a/buildconf
+++ b/buildconf
@@ -56,43 +56,38 @@
 # buildconf: Build the support scripts needed to compile from a
 #            checked-out version of the source code.
 
-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
+# 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
 
-        libtoolize=`build/PrintPath glibtoolize libtoolize`
-        if [ "x$libtoolize" = "x" ]; then
-            echo "libtoolize not found in path"
-            exit 1
-        fi
+# 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 ..."
 
-        # 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 --copy --automake
 
-        $libtoolize --copy --automake
+ltpath=`dirname $libtoolize`
+ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
 
-        ltpath=`dirname $libtoolize`
-        ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+if [ ! -f $ltfile ]; then
+    echo "$ltfile not found"
+    exit 1
+fi
+cp -f $ltfile build/libtool.m4
 
-        if [ ! -f $ltfile ]; then
-            echo "$ltfile not found"
-            exit 1
-        fi
-        cp -f $ltfile aclocal.m4
-        ;;
-esac
+# 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
 
 #
 # Generate the autoconf header and ./configure
diff --git a/configure.in b/configure.in
index c475e17d9..01136029c 100644
--- a/configure.in
+++ b/configure.in
@@ -15,6 +15,7 @@ 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"
@@ -78,7 +79,18 @@ dnl
 dnl prep libtool
 dnl
 echo "performing libtool configuration..."
-AC_PROG_LIBTOOL
+
+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
 
 dnl #----------------------------- Checks for compiler flags
 nl='