summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorRyan Bloom <rbb@apache.org>2001-03-08 19:20:25 +0100
committerRyan Bloom <rbb@apache.org>2001-03-08 19:20:25 +0100
commit49c5ce3590a49e13416bd6a0ea29894d41ba0542 (patch)
tree40da376094b4faadfe8fbd9fc095b27acd2acceb /configure.in
parent Goodbye srclib/expat ... completes the build for srclib/apr-util/xml/expat (diff)
downloadapache2-49c5ce3590a49e13416bd6a0ea29894d41ba0542.tar.xz
apache2-49c5ce3590a49e13416bd6a0ea29894d41ba0542.zip
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
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in11
1 files changed, 1 insertions, 10 deletions
diff --git a/configure.in b/configure.in
index 07f497a7c3..d4f504cba1 100644
--- a/configure.in
+++ b/configure.in
@@ -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