Commit 5a2131c0 authored by Brian Havard's avatar Brian Havard
Browse files

Libtool takes care of the lib prefix so get rid of our own workaround. 


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

configure.in

+1 −2
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ APACHE_SUBST(MPM_LIB) 
APACHE_SUBST(OS)

APACHE_SUBST(OS_DIR)

APACHE_SUBST(BUILTIN_LIBS)

APACHE_SUBST(LIBPRE)



AM_DISABLE_SHARED

AM_PROG_LIBTOOL
@@ -213,7 +212,7 @@ if test "$apache_need_expat" = "yes"; then 
fi



dnl APR should go after the other libs, so the right symbols can be picked up

AP_LIBS="$AP_LIBS srclib/apr/\$(LIBPRE)apr.la"

AP_LIBS="$AP_LIBS srclib/apr/libapr.la"

APACHE_SUBST(AP_LIB_DIRS)

APACHE_SUBST(AP_LIBS)

os/config.m4

+0 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ AC_MSG_CHECKING(for target platform) 


#PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`

PLATFORM=$host

LIBPRE=lib



case "$PLATFORM" in

*beos*)
@@ -10,7 +9,6 @@ case "$PLATFORM" in 
  OS_DIR=$OS

  ;;

*pc-os2_emx*)

  LIBPRE=""

  OS="os2"

  OS_DIR=$OS

  ;;

support/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ targets = $(PROGRAMS) 


PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)

PROGRAM_DEPENDENCIES = \

	../srclib/apr-util/libaprutil.la ../srclib/apr/$(LIBPRE)apr.la

	../srclib/apr-util/libaprutil.la ../srclib/apr/libapr.la



include $(top_srcdir)/build/rules.mk

test/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ PROGRAMS = 


PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)

PROGRAM_DEPENDENCIES = ../srclib/apr-util/libaprutil.la \

	../srclib/apr/$(LIBPRE)apr.a

	../srclib/apr/libapr.la



include $(top_srcdir)/build/rules.mk