Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Message-ID: <20050613124959.66444.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r190392 - in /httpd/httpd/trunk: Makefile.in build/
 build/config_vars.sh.in configure.in
Date: Mon, 13 Jun 2005 12:49:58 -0000
To: cvs@httpd.apache.org
From: jorton@apache.org

Author: jorton
Date: Mon Jun 13 05:49:58 2005
New Revision: 190392

URL: http://svn.apache.org/viewcvs?rev=3D190392&view=3Drev
Log:
Sanitize the installed config_vars.mk to remove references to the
build and source directories, and to remove variables which are
internal to the httpd build system:

* build/config_vars.sh.in: New file.

* Makefile.in (build/config_vars.out): New target.
(install-build): Install build/config_vars.out as config_vars.mk.

* configure.in: Add include path for srclib/pcre to INCLUDES rather
than CPPFLAGS, and use a topdir-relative not absolute path name.
Generate build/config_vars.sh.

Reviewed by: Paul Querna
PR: 20874, 28145

Added:
    httpd/httpd/trunk/build/config_vars.sh.in
Modified:
    httpd/httpd/trunk/Makefile.in
    httpd/httpd/trunk/build/   (props changed)
    httpd/httpd/trunk/configure.in

Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.in?rev=3D1903=
92&r1=3D190391&r2=3D190392&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Mon Jun 13 05:49:58 2005
@@ -21,7 +21,7 @@
 DISTCLEAN_TARGETS  =3D include/ap_config_auto.h include/ap_config_layout.h=
 \
 	modules.c config.cache config.log config.status build/config_vars.mk \
 	build/rules.mk docs/conf/httpd.conf docs/conf/extra/*.conf shlibtool \
-	build/pkg/pkginfo
+	build/pkg/pkginfo build/config_vars.sh
 EXTRACLEAN_TARGETS =3D configure include/ap_config_auto.h.in generated_lis=
ts \
 	httpd.spec
=20
@@ -85,7 +85,11 @@
 	    fi ; \
 	fi
=20
-install-build:
+# Create a sanitized config_vars.mk
+build/config_vars.out: build/config_vars.mk
+	@$(SHELL) build/config_vars.sh < build/config_vars.mk > build/config_vars=
.out
+
+install-build: build/config_vars.out
 	@echo Installing build system files=20
 	@$(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir)=20
 	@for f in $(top_srcdir)/build/*.mk build/*.mk; do \
@@ -96,8 +100,8 @@
 		  $(top_srcdir)/build/instdso.sh; do \
 	 $(INSTALL_PROGRAM) $$f $(DESTDIR)$(installbuilddir); \
 	done
-	@sed "/^LIBTOOL/s#/[^ ]*/libtool \(.*\)#`$(APR_CONFIG) --apr-libtool` $(L=
TFLAGS)#" \
-	    build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk
+	@$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/confi=
g_vars.mk
+	@rm build/config_vars.out
=20
 htdocs-srcdir =3D $(top_srcdir)/docs/docroot
=20

Propchange: httpd/httpd/trunk/build/
---------------------------------------------------------------------------=
---
--- svn:ignore (original)
+++ svn:ignore Mon Jun 13 05:49:58 2005
@@ -8,3 +8,4 @@
 PrintPath
 config.sub
 config.guess
+config_vars.sh

Added: httpd/httpd/trunk/build/config_vars.sh.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/build/config_vars.sh.i=
n?rev=3D190392&view=3Dauto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- httpd/httpd/trunk/build/config_vars.sh.in (added)
+++ httpd/httpd/trunk/build/config_vars.sh.in Mon Jun 13 05:49:58 2005
@@ -0,0 +1,60 @@
+#! @SHELL@
+# -*- sh -*-
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# config_vars.sh is generated by configure, and is run by the "install-bui=
ld"
+# target to generate a version of config_vars.mk which is suitable to be
+# installed.  Such a file cannot be generated at configure-time, since it
+# requires the output of the *installed* ap*-config scripts.
+
+APR_CONFIG=3D@APR_CONFIG@
+APU_CONFIG=3D@APU_CONFIG@
+
+APR_LIBTOOL=3D"`${APR_CONFIG} --apr-libtool`"
+APR_INCLUDEDIR=3D"`${APR_CONFIG} --includedir`"
+APU_INCLUDEDIR=3D"`${APU_CONFIG} --includedir`"
+
+exec sed "
+/^[A-Z_]*_LDADD/d
+/MPM_LIB/d
+/APACHECTL_ULIMIT/d
+/[a-z]*_LTFLAGS/d
+/^DSO_MODULES/d
+/^MODULE_/d
+/^PORT/d
+/^nonssl_/d
+/^CORE_IMPLIB/d
+/^rel_/d
+/^abs_srcdir/d
+/^BUILTIN_LIBS/d
+/^[A-Z]*_SHARED_CMDS/d
+/^shared_build/d
+/^OS_DIR/d
+/^AP_LIBS/d
+/^OS_SPECIFIC_VARS/d
+/^MPM_SUBDIR_NAME/d
+/^EXTRA_INCLUDES/{=20
+  s, =3D , =3D -I\$(includedir) ,
+  s, -I\$(top_srcdir)/[^ ]*,,g
+  s, -I\$(top_builddir)/[^ ]*,,g
+}
+/^HTTPD_LDFLAGS/d
+/^UTIL_LDFLAGS/d
+/^APR_INCLUDEDIR.*$/s,.*,APR_INCLUDEDIR =3D ${APR_INCLUDEDIR},
+/^APU_INCLUDEDIR.*$/s,.*,APU_INCLUDEDIR =3D ${APU_INCLUDEDIR},
+/^LIBTOOL.*$/s,/[^ ]*/libtool \(.*\),${APR_LIBTOOL} \$(LTFLAGS),
+"

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/configure.in?rev=3D190=
392&r1=3D190391&r2=3D190392&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Mon Jun 13 05:49:58 2005
@@ -166,7 +166,7 @@
                   [--prefix=3D$prefix --exec-prefix=3D$exec_prefix --libdi=
r=3D$libdir --includedir=3D$includedir --bindir=3D$bindir])
=20
   APR_ADDTO(AP_LIBS, [$abs_builddir/srclib/pcre/libpcre.la])
-  APR_ADDTO(CPPFLAGS, [-I$abs_builddir/srclib/pcre])
+  APR_ADDTO(INCLUDES, [-I\$(top_builddir)/srclib/pcre])
=20
   AP_BUILD_SRCLIB_DIRS=3D"$AP_BUILD_SRCLIB_DIRS pcre"
   AP_CLEAN_SRCLIB_DIRS=3D"$AP_CLEAN_SRCLIB_DIRS pcre"=20
@@ -648,7 +648,7 @@
 HTTPD_VERSION=3D`$abs_srcdir/build/get-version.sh all $abs_srcdir/include/=
ap_release.h AP_SERVER`
 AC_SUBST(HTTPD_VERSION)
=20
-AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd.conf docs/conf/extra/httpd-=
autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default=
.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf =
docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/=
extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-ssl.conf docs/con=
f/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf include/ap_con=
fig_layout.h support/apxs support/apachectl support/dbmmanage support/envva=
rs-std support/log_server_status support/logresolve.pl support/phf_abuse_lo=
g=2Ecgi support/split-logfile build/rules.mk build/pkg/pkginfo,[true],[
+AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd.conf docs/conf/extra/httpd-=
autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default=
.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf =
docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/=
extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-ssl.conf docs/con=
f/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf include/ap_con=
fig_layout.h support/apxs support/apachectl support/dbmmanage support/envva=
rs-std support/log_server_status support/logresolve.pl support/phf_abuse_lo=
g=2Ecgi support/split-logfile build/rules.mk build/pkg/pkginfo build/config=
_vars.sh,[true],[
   APACHE_GEN_MAKEFILES
 ])
=20