You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bj...@locus.apache.org on 2000/04/04 15:31:13 UTC
cvs commit: apache-2.0/src/os config.m4
bjh 00/04/04 06:31:13
Modified: src Makefile.in configure.in
src/os config.m4
Log:
Under OS/2 (well actually EMX gcc) libraries don't have a 'lib' prefix. In
main code libtool handles it. This deals with APR.
Revision Changes Path
1.7 +1 -1 apache-2.0/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 2000/03/27 23:21:22 1.6
+++ Makefile.in 2000/04/04 13:31:12 1.7
@@ -15,7 +15,7 @@
main/libmain.la \
$(OS_DIR)/libos.la \
ap/libap.la \
- lib/apr/libapr.a \
+ lib/apr/$(LIBPRE)apr.a \
$(REGEX_LIB)
PROGRAMS = $(PROGRAM_NAME)
1.28 +1 -0 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- configure.in 2000/03/31 02:38:32 1.27
+++ configure.in 2000/04/04 13:31:12 1.28
@@ -138,6 +138,7 @@
APACHE_SUBST(OS)
APACHE_SUBST(OS_DIR)
APACHE_SUBST(BUILTIN_LIBS)
+APACHE_SUBST(LIBPRE)
AM_DISABLE_SHARED
AM_PROG_LIBTOOL
1.6 +4 -1 apache-2.0/src/os/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/config.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.m4 2000/02/17 22:32:30 1.5
+++ config.m4 2000/04/04 13:31:13 1.6
@@ -2,12 +2,15 @@
#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