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

diff --git a/configure.in b/configure.in
index 0e6554ec745968c298dcfb9edc0a0f1f3ba4a6b2..63f7f75ad44f327ee64b97615a3f861a0dc63dcc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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)
 

diff --git a/os/config.m4 b/os/config.m4
index 586940142198f6aee076ce8299b304f69a519e78..7442325d73aee9f83dff2bf0cf47206e45d049fd 100644 (file)
--- a/os/config.m4
+++ b/os/config.m4
@@ -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
   ;;

diff --git a/support/Makefile.in b/support/Makefile.in
index da2c388bab4e0d36bf9e57f563e54cd4750a28dd..ba1129824140af220d3eb416429b722bd8360d4c 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -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
 

diff --git a/test/Makefile.in b/test/Makefile.in
index 8fd649ea617d3f05c18127e350892f805a7d3b15..1426e44c950043a7e9f0f0e061a234d60205e183 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -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