From: Greg Stein Date: Tue, 9 Jan 2001 11:35:51 +0000 (+0000) Subject: a couple tweaks to get Apache building with the new libtool-ized APR X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~242 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=591d6e4e8aadca9b4ce0591328748065377c5b3b;p=apache a couple tweaks to get Apache building with the new libtool-ized APR git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87631 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/build/build2.mk b/build/build2.mk index 1eb6e67750..83a7299b7a 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -121,7 +121,8 @@ $(aprutil_configure): srclib/apr-util/configure.in @echo rebuilding $@ (cd srclib/apr-util && ./buildconf.sh) -$(apr_configure): srclib/apr/aclocal.m4 srclib/apr/configure.in srclib/apr/apr_common.m4 srclib/apr/hints.m4 +### we shouldn't (have to) know what goes into the configure script! +$(apr_configure): srclib/apr/helpers/apr-conf.m4 srclib/apr/configure.in srclib/apr/apr_common.m4 srclib/apr/hints.m4 @echo rebuilding $@ (cd srclib/apr && ./buildconf) diff --git a/configure.in b/configure.in index 0af2b70ad3..afba2bfc7e 100644 --- a/configure.in +++ b/configure.in @@ -213,7 +213,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.a" +AP_LIBS="$AP_LIBS srclib/apr/\$(LIBPRE)apr.la" APACHE_SUBST(AP_LIB_DIRS) APACHE_SUBST(AP_LIBS) @@ -248,7 +248,7 @@ dnl ## or disable threads), while still allowing APR to run and generate dnl ## APRVARS before Apache generates it's Makefiles and the related files. dnl ## This allows APR to detect libraries like dl and tell Apache that it dnl ## needs to include or not include them. -RUN_SUBDIR_CONFIG_NOW(srclib/apr, $apache_apr_flags) +RUN_SUBDIR_CONFIG_NOW(srclib/apr, "$apache_apr_flags --disable-shared") RUN_SUBDIR_CONFIG_NOW(srclib/apr-util, "--with-apr=../apr --disable-shared") RUN_SUBDIR_CONFIG_NOW(srclib/pcre) . ./srclib/apr/APRVARS