Commit 97cc9de7 authored by Brian Havard's avatar Brian Havard
Browse files

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
parent 10f06163

Makefile.in

+1 −1
Changes for Makefile.in: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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)

configure.in

+1 −0
Changes for configure.in: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -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

os/config.m4

+4 −1
Changes for os/config.m4: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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