You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2004/09/20 15:25:47 UTC
cvs commit: httpd-2.0/build .cvsignore PrintPath config.guess config.sub
jorton 2004/09/20 06:25:47
Modified: . Tag: APACHE_2_0_BRANCH STATUS buildconf
build Tag: APACHE_2_0_BRANCH .cvsignore
Removed: build Tag: APACHE_2_0_BRANCH PrintPath config.guess
config.sub
Log:
Backport from HEAD:
* buildconf: Ensure that make never regenerates the mod_ssl expression
parser files from the lex/yacc sources.
* buildconf: Clean autoconf cache after running autoconf too.
* build/config.guess, build/config.sub: Remove since buildconf copies
these files from APR.
Reviewed by: trawick, jerenkrantz
Revision Changes Path
No revision
No revision
1.751.2.1064 +1 -9 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.1063
retrieving revision 1.751.2.1064
diff -d -w -u -r1.751.2.1063 -r1.751.2.1064
--- STATUS 19 Sep 2004 23:16:32 -0000 1.751.2.1063
+++ STATUS 20 Sep 2004 13:25:46 -0000 1.751.2.1064
@@ -87,14 +87,6 @@
modules/ldap/util_ldap_cache_mgr.c: 1.7
+1: minfrin
- *) buildconf: Clean autoconf cache and do mod_ssl timestamp dance.
- http://cvs.apache.org/viewcvs.cgi/httpd-2.0/buildconf?r1=1.37&r2=1.40
- +1: jorton, trawick, jerenkrantz
-
- *) remove config.{guess,sub} and PrintPath from build (they are copied
- by buildconf already)
- +1: jorton, trawick, jerenkrantz
-
*) Use HTML 2.0 <hr> for error pages. PR 30732
modules/http/http_protocol.c: r1.483
+1: nd, jorton, trawick, jerenkrantz
1.27.2.13 +14 -0 httpd-2.0/buildconf
Index: buildconf
===================================================================
RCS file: /home/cvs/httpd-2.0/buildconf,v
retrieving revision 1.27.2.12
retrieving revision 1.27.2.13
diff -d -w -u -r1.27.2.12 -r1.27.2.13
--- buildconf 9 Feb 2004 20:59:43 -0000 1.27.2.12
+++ buildconf 20 Sep 2004 13:25:46 -0000 1.27.2.13
@@ -140,6 +140,17 @@
cp $apr_src_dir/build/ltmain.sh build
fi
+# ensure that the mod_ssl expression parser sources are never regenerated
+# when running make
+echo fixing timestamps for mod_ssl sources
+cd modules/ssl
+touch ssl_expr_parse.y
+sleep 1
+touch ssl_expr_parse.c ssl_expr_parse.h ssl_expr_scan.l
+sleep 1
+touch ssl_expr_scan.c
+cd ../..
+
echo rebuilding $pcre_configure
(cd srclib/pcre && ${AUTOCONF:-autoconf})
@@ -150,6 +161,9 @@
echo rebuilding configure
rm -f config.cache
${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
+
+# Remove autoconf 2.5x's cache directory
+rm -rf autom4te*.cache
echo rebuilding rpm spec file
( VMMN=`build/get-version.sh mmn include/ap_mmn.h MODULE_MAGIC_NUMBER`
No revision
No revision
1.2.2.4 +3 -0 httpd-2.0/build/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/httpd-2.0/build/.cvsignore,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -d -w -u -r1.2.2.3 -r1.2.2.4
--- .cvsignore 28 Jul 2003 01:50:56 -0000 1.2.2.3
+++ .cvsignore 20 Sep 2004 13:25:47 -0000 1.2.2.4
@@ -5,3 +5,6 @@
find_apu.m4
ltconfig
ltmain.sh
+config.guess
+config.sub
+PrintPath