Commit 9c63b7de authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Fix a compile break with the new APR libtool setup. Basically, we are

using a libtool library from MM, but it isn't getting linked into the
Apache executable, so we fail the link stage.  This makes APR
publicize the libtool libraries that it uses, so that Apache can link
them in.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87633 13f79535-47bb-0310-9956-ffa450edef68
parent 56d40529
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ apache_need_expat=yes

dnl AP_LIB_DIRS specifies the additional libs from srclib/ that we need
dnl AP_LIBS specifies the actual libraries. note we have some required libs.
AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/libaprutil.la"
AP_LIBS="srclib/pcre/libpcre.la srclib/apr-util/libaprutil.la $AP_LIBS"

if test "$apache_need_expat" = "yes"; then
  AP_LIB_DIRS="$AP_LIB_DIRS expat-lite"
@@ -256,6 +256,7 @@ RUN_SUBDIR_CONFIG_NOW(srclib/pcre)
dnl get the exported vars from APRUTIL
. ./srclib/apr-util/export_vars.sh
EXTRA_LIBS="$EXTRA_LIBS $APRUTIL_EXPORT_LIBS"
AP_LIBS="$AP_LIBS $LIBTOOL_LIBS"

APACHE_GEN_CONFIG_VARS