Author: pgollucci
Date: Fri Sep 1 02:24:29 2006
New Revision: 439245
URL: http://svn.apache.org/viewvc?rev=439245&view=rev
Log:
code around autoconf 2.60 bug
Modified:
httpd/apreq/trunk/CHANGES
httpd/apreq/trunk/build/version_check.pl
httpd/apreq/trunk/glue/perl/Makefile.PL
Modified: httpd/apreq/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/CHANGES?rev=439245&r1=439244&r2=439245&view=diff
==============================================================================
--- httpd/apreq/trunk/CHANGES (original)
+++ httpd/apreq/trunk/CHANGES Fri Sep 1 02:24:29 2006
@@ -2,7 +2,11 @@
//! brief List of major changes.
[EMAIL PROTECTED] v2_08 Changes with libapreq2-2.09 (under developement)
[EMAIL PROTECTED] v2_09 Changes with libapreq2-2.09 (under developement)
+
+- Build [Philip M. Gollucci]
+ code around |#_!!_#| autoconf 2.60 bug.
+
@section v2_08 Changes with libapreq2-2.08 (released August 8, 2006)
Modified: httpd/apreq/trunk/build/version_check.pl
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/build/version_check.pl?rev=439245&r1=439244&r2=439245&view=diff
==============================================================================
--- httpd/apreq/trunk/build/version_check.pl (original)
+++ httpd/apreq/trunk/build/version_check.pl Fri Sep 1 02:24:29 2006
@@ -47,7 +47,7 @@
my %svn = (
libtool => { version => "1.4.3", test => \&gnu_version },
- autoconf => { version => "2.53", test => \&gnu_version,
broken_version => '2.60' },
+ autoconf => { version => "2.53", test => \&gnu_version },
automake => { version => "1.6.1", test => \&gnu_version },
doxygen => { version => "1.2", test => \&gnu_version,
broken_version => '1.4.5' },
perl => { version => "5.6.1", test => \&gnu_version },
Modified: httpd/apreq/trunk/glue/perl/Makefile.PL
URL:
http://svn.apache.org/viewvc/httpd/apreq/trunk/glue/perl/Makefile.PL?rev=439245&r1=439244&r2=439245&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/perl/Makefile.PL (original)
+++ httpd/apreq/trunk/glue/perl/Makefile.PL Fri Sep 1 02:24:29 2006
@@ -88,6 +88,14 @@
die "Can't find package version";
$version = $1;
+ ## Code around an autoconf 2.60 bug
+ ##
http://lists.gnu.org/archive/html/bug-autoconf/2006-06/msg00127.html
+ ## $ grep @PACKAGE_VERSION config.status-2.59
config.status-2.60
+ ## config.status-2.59:s,@PACKAGE_VERSION@,2.09,;t t
+ ## config.status-2.60:s,@PACKAGE_VERSION@,|#_!!_#|2.09,g
+ foreach ($apache_includes, $apreq_libname, $version) {
+ s/\|#_!!_#\|//g;
+ }
}
my $apreq_libs = WIN32 ?
