Make it easier to replace libtool on OS/2 by copying libtool.m4 into

aclocal.m4 rather than distributing it under its own name.  This way
we can copy a replacement for libtool.m4 on those platforms that don't
work well with libtool.


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

1 files changed, 32 insertions, 27 deletions

diff --git a/buildconf b/buildconf
index 06e0f3f9f..9f867997b 100755
--- a/buildconf
+++ b/buildconf
@@ -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