diff options
| author | Brian Havard <bjh@apache.org> | 2000-04-04 15:31:13 +0200 |
|---|---|---|
| committer | Brian Havard <bjh@apache.org> | 2000-04-04 15:31:13 +0200 |
| commit | 6352ccc914864fc7f1a046f27198629ffaa62e1d (patch) | |
| tree | c9860cdfa8687692e7ef7f3842053cc6cbd3eba5 | |
| parent | Clarify the DOCUMENT_ROOT environment variable oddity. (diff) | |
| download | apache2-6352ccc914864fc7f1a046f27198629ffaa62e1d.tar.xz apache2-6352ccc914864fc7f1a046f27198629ffaa62e1d.zip | |
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
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | os/config.m4 | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 5f0ff02abb..93ea431e34 100644 --- 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 fdc678f6dd..405aa268ef 100644 --- 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 2e28b975b4..8422e10082 100644 --- 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 |