httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r160869 - in httpd/apreq/branches/multi-env-unstable: build/version_check.pl buildconf library/t/Makefile.am module/apache/Makefile.am module/apache2/Makefile.am
Date Mon, 11 Apr 2005 12:36:51 GMT
Author: joes
Date: Mon Apr 11 05:36:49 2005
New Revision: 160869

URL: http://svn.apache.org/viewcvs?view=rev&rev=160869
Log:
Upgrade automake prereq to 1.6.

Modified:
    httpd/apreq/branches/multi-env-unstable/build/version_check.pl
    httpd/apreq/branches/multi-env-unstable/buildconf
    httpd/apreq/branches/multi-env-unstable/library/t/Makefile.am
    httpd/apreq/branches/multi-env-unstable/module/apache/Makefile.am
    httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am

Modified: httpd/apreq/branches/multi-env-unstable/build/version_check.pl
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/build/version_check.pl?view=diff&r1=160868&r2=160869
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/build/version_check.pl (original)
+++ httpd/apreq/branches/multi-env-unstable/build/version_check.pl Mon Apr 11 05:36:49 2005
@@ -9,7 +9,7 @@
 sub exe_version { scalar qx/$path -v/ }
 sub gnu_version { scalar qx/$path --version/ }
 
-sub xsb_version { 
+sub xsb_version {
     eval {
         require ExtUtils::XSBuilder;
     };
@@ -41,7 +41,7 @@
 my %svn = (
                 libtool => { version => "1.4.3",   test => \&gnu_version },
                autoconf => { version => "2.53",    test => \&gnu_version },
-               automake => { version => "1.4.0",   test => \&gnu_version },
+               automake => { version => "1.6.0",   test => \&gnu_version },
                 doxygen => { version => "1.2",     test => \&gnu_version },
                    perl => { version => "5.6.1",   test => \&gnu_version },
   "ExtUtils::XSBuilder" => { version => "0.23",    test => \&xsb_version },

Modified: httpd/apreq/branches/multi-env-unstable/buildconf
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/buildconf?view=diff&r1=160868&r2=160869
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/buildconf (original)
+++ httpd/apreq/branches/multi-env-unstable/buildconf Mon Apr 11 05:36:49 2005
@@ -20,6 +20,11 @@
 
 perl="perl"
 libtool="libtool"
+aclocal="aclocal"
+automake="automake"
+autoconf="autoconf"
+autoheader="autoheader"
+
 
 while test $# -gt 0 
 do
@@ -36,6 +41,18 @@
   --with-libtool=*)
   libtool=$optarg
   ;;
+  --with-aclocal=*)
+  aclocal=$optarg
+  ;;
+  --with-automake=*)
+  automake=$optarg
+  ;;
+  --with-autoconf=*)
+  autoconf=$optarg
+  ;;
+  --with-autoheader=*)
+  autoheader=$optarg
+  ;;
   esac
 
   shift
@@ -51,15 +68,15 @@
 
 echo "checking buildconf prereqs";
 $perl build/version_check.pl libtool $libtool  || exit 1
-$perl build/version_check.pl autoconf  || exit 1
-$perl build/version_check.pl automake  || exit 1
+$perl build/version_check.pl autoconf $autoconf  || exit 1
+$perl build/version_check.pl automake $automake  || exit 1
 $perl build/version_check.pl ExtUtils::XSBuilder || exit 1
 
 echo "running $libtoolize" && $libtoolize && \
-echo "running aclocal"  && aclocal && \
-echo "running autoconf" && autoconf && \
-echo "running autoheader" && autoheader && \
-echo "running automake -a -c" && automake -a -c && \
+echo "running $aclocal"  && $aclocal && \
+echo "running $autoconf" && $autoconf && \
+echo "running $autoheader" && $autoheader && \
+echo "running $automake -a -c" && $automake -a -c && \
 echo "running xsbuilder" && (cd glue/perl && $perl ../../build/xsbuilder.pl)
&& \
 echo "buildconf successful."
 

Modified: httpd/apreq/branches/multi-env-unstable/library/t/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/library/t/Makefile.am?view=diff&r1=160868&r2=160869
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/library/t/Makefile.am (original)
+++ httpd/apreq/branches/multi-env-unstable/library/t/Makefile.am Mon Apr 11 05:36:49 2005
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = @APR_INCLUDES@
-LDFLAGS = @APR_LTFLAGS@ `@APREQ_CONFIG@ --link-libtool --libs`
+AM_LDFLAGS = @APR_LTFLAGS@ `@APREQ_CONFIG@ --link-libtool --libs`
 noinst_LIBRARIES = libapache_test.a
 libapache_test_a_SOURCES = at.h at.c
 

Modified: httpd/apreq/branches/multi-env-unstable/module/apache/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache/Makefile.am?view=diff&r1=160868&r2=160869
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/apache/Makefile.am (original)
+++ httpd/apreq/branches/multi-env-unstable/module/apache/Makefile.am Mon Apr 11 05:36:49
2005
@@ -1,3 +1,10 @@
+AM_CPPFLAGS = $(APACHE1_INCLUDES) @APR_INCLUDES@
+TEST_CONFIG_SCRIPT = package Apache::TestMM; filter_args(); generate_script("t/TEST")
+
+pkgcfgdir = `@APACHE1_APXS@ -q SYSCONFDIR`
+pkglibdir = `@APACHE1_APXS@ -q LIBEXECDIR`
+pkgincludedir = `@APACHE1_APXS@ -q INCLUDEDIR`/@APREQ_LIBNAME@
+
 if MAINTAINER_MODE
 
 APACHE1_INCLUDES = -isystem `@APACHE1_APXS@ -q INCLUDEDIR`
@@ -9,11 +16,6 @@
 endif
 
 
-
-AM_CPPFLAGS = $(APACHE1_INCLUDES) @APR_INCLUDES@
-TEST_CONFIG_SCRIPT = package Apache::TestMM; filter_args(); generate_script("t/TEST")
-
-pkginclude_HEADERS = apreq_module_apache.h
 mod_apreq2_la_LDFLAGS = -export-dynamic -module -avoid-version @APR_LTFLAGS@ \
                         `@APREQ_CONFIG@ --link-libtool --libs`
 mod_apreq2_la_SOURCES = apreq_private_apache.h handle.c command.c
@@ -21,9 +23,7 @@
 
 if HAVE_APACHE1
 
-pkgcfgdir = `@APACHE1_APXS@ -q SYSCONFDIR`
-pkglibdir = `@APACHE1_APXS@ -q LIBEXECDIR`
-pkgincludedir = `@APACHE1_APXS@ -q INCLUDEDIR`/@APREQ_LIBNAME@
+pkginclude_HEADERS = apreq_module_apache.h
 pkglib_LTLIBRARIES = mod_apreq2.la
 
 run_tests : t/TEST

Modified: httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am?view=diff&r1=160868&r2=160869
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am (original)
+++ httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am Mon Apr 11 05:36:49
2005
@@ -1,9 +1,11 @@
 TEST_CONFIG_SCRIPT = package Apache::TestMM; filter_args(); generate_script("t/TEST")
-pkginclude_HEADERS = apreq_module_apache2.h
 mod_apreq2_la_LDFLAGS = -export-dynamic -module -avoid-version @APR_LTFLAGS@ \
                         `@APREQ_CONFIG@ --link-libtool --libs`
 mod_apreq2_la_SOURCES = apreq_private_apache2.h handle.c filter.c
 
+pkgcfgdir = `@APACHE2_APXS@ -q SYSCONFDIR`
+pkgincludedir = `@APACHE2_APXS@ -q INCLUDEDIR`/@APREQ_LIBNAME@
+pkglibdir = `@APACHE2_APXS@ -q LIBEXECDIR`
 
 if MAINTAINER_MODE
 
@@ -32,9 +34,7 @@
 
 else
 
-pkgcfgdir = `@APACHE2_APXS@ -q SYSCONFDIR`
-pkgincludedir = `@APACHE2_APXS@ -q INCLUDEDIR`/@APREQ_LIBNAME@
-pkglibdir = `@APACHE2_APXS@ -q LIBEXECDIR`
+pkginclude_HEADERS = apreq_module_apache2.h
 pkglib_LTLIBRARIES = mod_apreq2.la
 
 install-exec-local :



Mime
View raw message