diff options
| author | Brian Havard <bjh@apache.org> | 2001-01-10 01:04:53 +0000 |
|---|---|---|
| committer | Brian Havard <bjh@apache.org> | 2001-01-10 01:04:53 +0000 |
| commit | a345ba4bf400a8f1b646d9e7c242d956ad467e00 (patch) | |
| tree | efa8a1fe5d420690317c9e06822baefbb5cb8ace | |
| parent | 322f19da6b7e48477945b7fd1f82008f9b4651be (diff) | |
| download | httpd-a345ba4bf400a8f1b646d9e7c242d956ad467e00.tar.gz | |
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
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | os/config.m4 | 2 | ||||
| -rw-r--r-- | support/Makefile.in | 2 | ||||
| -rw-r--r-- | test/Makefile.in | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 0e6554ec74..63f7f75ad4 100644 --- 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 5869401421..7442325d73 100644 --- 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 da2c388bab..ba11298241 100644 --- 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 8fd649ea61..1426e44c95 100644 --- 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 |