httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject cvs commit: httpd-apreq-2/t Makefile.am
Date Sat, 28 Feb 2004 05:19:39 GMT
joes        2004/02/27 21:19:39

  Modified:    .        acinclude.m4
               build    version_check.pl
               env      Makefile.am
               glue     Makefile.am
               src      Makefile.am
               t        Makefile.am
  Log:
  Reorganize build macros to reduce automake prereq to v1.4.  This should allow apreq2 to
build from cvs on stock Debian Woody.
  
  Revision  Changes    Path
  1.16      +5 -5      httpd-apreq-2/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/acinclude.m4,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- acinclude.m4	7 Nov 2003 20:40:49 -0000	1.15
  +++ acinclude.m4	28 Feb 2004 05:19:38 -0000	1.16
  @@ -1,4 +1,4 @@
  -AC_DEFUN(AC_APREQ, [
  +AC_DEFUN([AC_APREQ], [
   
           AC_ARG_ENABLE(perl_glue,
                   AC_HELP_STRING([--enable-perl-glue],[build perl modules Apache::Request
and Apache::Cookie]),
  @@ -103,9 +103,9 @@
             USE_VPATH=1
           fi
   
  -        AC_SUBST(top_builddir)
  -        AC_SUBST(abs_srcdir)
  -        AC_SUBST(abs_builddir)
  +        dnl AC_SUBST(top_builddir)
  +        dnl AC_SUBST(abs_srcdir)
  +        dnl AC_SUBST(abs_builddir)
   
           get_version="$abs_srcdir/build/get-version.sh"
           version_hdr="$abs_srcdir/src/apreq_version.h"
  @@ -147,7 +147,7 @@
           AC_SUBST(PERL)
   ])
   
  -AC_DEFUN(APR_ADDTO,[
  +AC_DEFUN([APR_ADDTO],[
     if test "x$$1" = "x"; then
       echo "  setting $1 to \"$2\""
       $1="$2"
  
  
  
  1.10      +1 -1      httpd-apreq-2/build/version_check.pl
  
  Index: version_check.pl
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/build/version_check.pl,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- version_check.pl	11 Nov 2003 01:11:01 -0000	1.9
  +++ version_check.pl	28 Feb 2004 05:19:38 -0000	1.10
  @@ -34,7 +34,7 @@
   my %cvs = (
                   libtool => { version => "1.4.2",   test => \&gnu_version },
                  autoconf => { version => "2.53",    test => \&gnu_version },
  -               automake => { version => "1.6.3",   test => \&gnu_version },
  +               automake => { version => "1.4.0",   test => \&gnu_version },
                   doxygen => { version => "1.3",     test => \&gnu_version },
             );
   
  
  
  
  1.19      +1 -3      httpd-apreq-2/env/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/env/Makefile.am,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Makefile.am	7 Nov 2003 20:05:20 -0000	1.18
  +++ Makefile.am	28 Feb 2004 05:19:38 -0000	1.19
  @@ -2,6 +2,7 @@
   LIBS = ../src/lib@APREQ_LIBNAME@.la @APR_LTLIBS@ @APU_LTLIBS@
   TEST_CONFIG_SCRIPT = package Apache::TestMM; filter_args(); generate_script("t/TEST")
   EXTRA_DIST = t c-modules
  +mod_apreq_la_LDFLAGS = -export-dynamic -module -avoid-version -rpath `@APACHE2_APXS@ -q
LIBEXECDIR`
   
   check_PROGRAMS = test_cgi
   
  @@ -24,11 +25,8 @@
   
   else
   
  -APACHE2_MODULES=`@APACHE2_APXS@ -q LIBEXECDIR`
  -
   noinst_LTLIBRARIES = mod_apreq.la
   mod_apreq_la_SOURCES = mod_apreq.c
  -mod_apreq_la_LDFLAGS = -export-dynamic -module -avoid-version -rpath $(APACHE2_MODULES)
   
   install-exec-local: mod_apreq.la
   	@APACHE2_APXS@ -i -a -n apreq mod_apreq.la
  
  
  
  1.4       +10 -0     httpd-apreq-2/glue/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/glue/Makefile.am,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.am	18 Oct 2003 21:03:06 -0000	1.3
  +++ Makefile.am	28 Feb 2004 05:19:38 -0000	1.4
  @@ -30,4 +30,14 @@
   
   test: perl_test
   
  +else
  +
  +all-local:
  +
  +install-exec-local:
  +
  +clean-local:
  +
  +test:
  +
   endif
  
  
  
  1.15      +3 -3      httpd-apreq-2/src/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/src/Makefile.am,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Makefile.am	27 Oct 2003 03:07:28 -0000	1.14
  +++ Makefile.am	28 Feb 2004 05:19:38 -0000	1.15
  @@ -1,12 +1,12 @@
   INCLUDES = @APR_INCLUDES@ @APU_INCLUDES@
   LIBS = @APR_LTLIBS@ @APU_LTLIBS@
   BUILT_SOURCES= @APR_LA@ @APU_LA@
  -lib_LTLIBRARIES = lib@APREQ_LIBNAME@.la
  -lib@APREQ_LIBNAME@_la_SOURCES = apreq.c apreq_version.c apreq_cookie.c \
  +lib_LTLIBRARIES = libapreq2.la
  +libapreq2_la_SOURCES = apreq.c apreq_version.c apreq_cookie.c \
                          apreq_params.c apreq_parsers.c apreq_env.c
   pkginclude_HEADERS = apreq.h apreq_version.h apreq_cookie.h \
                     apreq_params.h  apreq_env.h apreq_parsers.h
  -lib@APREQ_LIBNAME@_la_LDFLAGS = -version-info @APREQ_LIBTOOL_VERSION@
  +libapreq2_la_LDFLAGS = -version-info @APREQ_LIBTOOL_VERSION@
   
   pkgincludedir = $(includedir)/@APREQ_LIBNAME@
   
  
  
  
  1.17      +4 -4      httpd-apreq-2/t/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/httpd-apreq-2/t/Makefile.am,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Makefile.am	28 Oct 2003 14:00:08 -0000	1.16
  +++ Makefile.am	28 Feb 2004 05:19:39 -0000	1.17
  @@ -1,11 +1,11 @@
   INCLUDES = -I../src @APR_INCLUDES@ @APU_INCLUDES@
  -LIBS = ../src/lib@APREQ_LIBNAME@.la @APR_LTLIBS@ @APU_LTLIBS@
  +LIBS = ../src/libapreq2.la @APR_LTLIBS@ @APU_LTLIBS@
   
  -noinst_LIBRARIES = lib@APREQ_LIBNAME@_tests.a
  -lib@APREQ_LIBNAME@_tests_a_SOURCES = CuTest.h test_apreq.h CuTest.c cookie.c params.c parsers.c
  +noinst_LIBRARIES = libapreq2_tests.a
  +libapreq2_tests_a_SOURCES = CuTest.h test_apreq.h CuTest.c cookie.c params.c parsers.c
   
   check_PROGRAMS = testall
  -testall_LDADD  = lib@APREQ_LIBNAME@_tests.a
  +testall_LDADD  = libapreq2_tests.a
   
   test:	check
   	./testall -v
  
  
  

Mime
View raw message