Under OS/2 (well actually EMX gcc) libraries don't have a 'lib' prefix. In

main code libtool handles it. This deals with APR.

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

diff --git a/Makefile.in b/Makefile.in
index 5f0ff02abbdffb5660d28583425eb9e19486c6c6..93ea431e34a49b0ead28579afb62fd379e9854ce 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@ PROGRAM_DEPENDENCIES = \
   main/libmain.la \
   $(OS_DIR)/libos.la \
   ap/libap.la \
-  lib/apr/libapr.a \
+  lib/apr/$(LIBPRE)apr.a \
   $(REGEX_LIB)
 
 PROGRAMS        = $(PROGRAM_NAME)

diff --git a/configure.in b/configure.in
index fdc678f6dd369ab905bb5a9df046117d4f6b3f0f..405aa268ef901c9096a4479906727438f8e13dfe 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -138,6 +138,7 @@ APACHE_SUBST(MPM_LIB)
 APACHE_SUBST(OS)
 APACHE_SUBST(OS_DIR)
 APACHE_SUBST(BUILTIN_LIBS)
+APACHE_SUBST(LIBPRE)
 
 AM_DISABLE_SHARED
 AM_PROG_LIBTOOL

diff --git a/os/config.m4 b/os/config.m4
index 2e28b975b45f718cf650f11385d61d0de787c5c5..8422e10082b4b267dd07b095f641e09f1de1168c 100644 (file)
--- a/os/config.m4
+++ b/os/config.m4
@@ -2,12 +2,15 @@ AC_MSG_CHECKING(for target platform)
 
 #PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`
 PLATFORM=`$ac_config_guess`
+LIBPRE=lib
 
 case "$PLATFORM" in
 *beos*)
   OS="beos";;
 *pc-os2_emx*)
-  OS="os2";;
+  OS="os2"
+  LIBPRE=""
+  ;;
 *)
   OS="unix";;
 esac