Commit e5a954bd authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Get us closer to building on Unix. Not perfect yet, but we no longer 

should look for expat in srclib.


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

configure.in

+1 −10
Original line number Diff line number Diff line
@@ -197,19 +197,10 @@ AC_ARG_WITH(suexec-safepath, 
[  --with-suexec-safepath  Set the safepath],[

  AC_DEFINE_UNQUOTED(AP_SAFE_PATH, "$withval", [safe shell path for SuExec] ) ] )



dnl ### util_xml is always included, so we always need Expat (for now)

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"



if test "$apache_need_expat" = "yes"; then

  AP_LIB_DIRS="$AP_LIB_DIRS expat-lite"

  AP_LIBS="$AP_LIBS srclib/expat-lite/libexpat.la"

  INCLUDES="$INCLUDES -I\$(top_srcdir)/srclib/expat-lite"

fi



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

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

APACHE_SUBST(AP_LIB_DIRS)
@@ -251,7 +242,7 @@ 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.

APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --disable-shared")

APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --with-expat=../expat-lite --disable-shared")

APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --disable-shared")

APR_SUBDIR_CONFIG(srclib/pcre)

. ./srclib/apr/APRVARS