From c2b4abf996a777dea9cd21d01ec940ae71e6e5d4 Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Fri, 19 Oct 2012 17:24:50 -0400 Subject: [PATCH] Clean-up unused Apache header/library config vars apxs is used to build the Apache modules, so there is no need to configure the Apache / APR header and library paths. Signed-off-by: Dan Scott Signed-off-by: Mike Rylander --- Makefile.am | 2 -- Open-ILS/src/apachemods/Makefile.am | 2 +- Open-ILS/src/extras/eg_config.in | 4 ---- configure.ac | 14 -------------- 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index 35a79cd8f7..9aeb9ed053 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,8 +32,6 @@ export LOG=@localstatedir@/log # Derived from autoconf: export TMP = @TMP@ export APXS2 = @APXS2@ -export APACHE2_HEADERS = @APACHE2_HEADERS@ -export APR_HEADERS = @APR_HEADERS@ export LIBXML2_HEADERS = @LIBXML2_HEADERS@ export DBI_LIBS = @DBI_LIBS@ export OPENSRF_HEADERS = @OPENSRF_HEADERS@ diff --git a/Open-ILS/src/apachemods/Makefile.am b/Open-ILS/src/apachemods/Makefile.am index dd1f938a01..a79cb8c2e0 100644 --- a/Open-ILS/src/apachemods/Makefile.am +++ b/Open-ILS/src/apachemods/Makefile.am @@ -4,7 +4,7 @@ ## Process this file with automake to generate Makefile.in #------------------------------------------------------------- -AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/Open-ILS/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) -I$(OPENSRF_HEADERS) +AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/Open-ILS/include/ -I$(LIBXML2_HEADERS) -I$(OPENSRF_HEADERS) AM_LDFLAGS = -L$(LIBDIR) -L$(OPENSRF_LIBS) AP_LIBEXECDIR = `$(APXS2) -q LIBEXECDIR` diff --git a/Open-ILS/src/extras/eg_config.in b/Open-ILS/src/extras/eg_config.in index bba2b4b7c6..6f37ef688f 100644 --- a/Open-ILS/src/extras/eg_config.in +++ b/Open-ILS/src/extras/eg_config.in @@ -52,8 +52,6 @@ function showAll { echo INCLUDEDIR=@includedir@ echo SYSCONFDIR=@sysconfdir@ echo APXS2=@APXS2@ - echo APACHE2_HEADERS=@APACHE2_HEADERS@ - echo APR_HEADERS=@APR_HEADERS@ echo LIBXML2_HEADERS=@LIBXML2_HEADERS@ echo echo "Installed modules:" @@ -82,8 +80,6 @@ function showHelp { echo "--includedir displays includedir" echo "--sysconfdir displays sysconfdir" echo "--apxs displays location of apxs" - echo "--apache displays location of apache2 headers" - echo "--apr displays location of apr headers" echo "--libxml displays location of libxml2 headers" echo } diff --git a/configure.ac b/configure.ac index 38b848d2a3..87698eb181 100644 --- a/configure.ac +++ b/configure.ac @@ -220,18 +220,6 @@ if ! test -x "$APXS2"; then fi AC_SUBST([APXS2]) -AC_ARG_WITH([apache], -[ --with-apache=path location of the Apache headers (default is /usr/include/apache2)], -[APACHE2_HEADERS=${withval}], -[APACHE2_HEADERS=/usr/include/apache2]) -AC_SUBST([APACHE2_HEADERS]) - -AC_ARG_WITH([apr], -[ --with-apr=path location of the Apache Portable Runtime (APR) headers (default is /usr/include/apr-1.0/)], -[APR_HEADERS=${withval}], -[APR_HEADERS=/usr/include/apr-1.0]) -AC_SUBST([APR_HEADERS]) - AC_ARG_WITH([libxml2], [ --with-libxml2=path location of the libxml2 headers (default is /usr/include/libxml2)], [LIBXML2_HEADERS=${withval}], @@ -431,8 +419,6 @@ AC_MSG_RESULT([-------- Installation Directories --------]) AC_MSG_RESULT(Installation directory prefix: ${prefix}) AC_MSG_RESULT(Temporary directory: ${TMP}) AC_MSG_RESULT(APXS2 location: ${APXS2}) -AC_MSG_RESULT(Apache headers location: ${APACHE2_HEADERS}) -AC_MSG_RESULT(APR headers location: ${APR_HEADERS}) AC_MSG_RESULT(libxml2 headers location: ${LIBXML2_HEADERS}) AC_MSG_RESULT(libdbi location: ${DBI_LIBS}) AC_MSG_RESULT(OpenSRF headers location: ${OPENSRF_HEADERS}) -- 2.43.2