svn commit: r153686 - in httpd/apreq/branches/multi-env-unstable/module: apache2/Makefile.am apache2/t/ t/TEST.PL t/c-modules/

[joes]

Author: joes
Date: Sun Feb 13 16:42:32 2005
New Revision: 153686

URL: http://svn.apache.org/viewcvs?view=rev&rev=153686
Log:

Move modules/apache2/t to modules/t/c-modules.  The 
reason for this move is that their compilation is 
controlled by t/TEST.PL, not Makefile.am.



Added:
    httpd/apreq/branches/multi-env-unstable/module/t/c-modules/
      - copied from r153666, 
httpd/apreq/branches/multi-env-unstable/module/apache2/t/
Removed:
    httpd/apreq/branches/multi-env-unstable/module/apache2/t/
Modified:
    httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am
    httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL

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=153685&r2=153686
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am 
(original)
+++ httpd/apreq/branches/multi-env-unstable/module/apache2/Makefile.am Sun Feb 
13 16:42:32 2005
@@ -24,9 +24,6 @@
 
 all-local: @APACHE2_HTTPD@
 
-t/TEST : Makefile.am t/TEST.PL
-       @PERL@ -MApache::TestMM -e '$(TEST_CONFIG_SCRIPT)' -- -httpd 
@APACHE2_HTTPD@
-
 else
 
 noinst_LTLIBRARIES = mod_apreq2.la
@@ -34,8 +31,5 @@
 
 install-exec-local: mod_apreq.la
        @APACHE2_APXS@ -i -a -n apreq2 mod_apreq2.la
-
-t/TEST : Makefile.am t/TEST.PL
-       @PERL@ -MApache::TestMM -e '$(TEST_CONFIG_SCRIPT)' -- -apxs 
@APACHE2_APXS@
 
 endif

Modified: httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL
URL: 
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL?view=diff&r1=153685&r2=153686
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL (original)
+++ httpd/apreq/branches/multi-env-unstable/module/t/TEST.PL Sun Feb 13 
16:42:32 2005
@@ -48,7 +48,7 @@
 
 sub cmodules_configure {
     my $self = shift;
-    my $dir = "$module_dir/apache2/t";
+    my $dir = "$module_dir/t/c-modules";
     $self->SUPER::cmodules_configure($dir);
 }
 sub cmodules_httpd_conf {
@@ -79,7 +79,7 @@
 all: $lib
 
 $lib: $name.c
-        \$(APXS) -I../.. -I../../../../include $libs -llibhttpd $dversion -p 
-I$self->{cmodules_dir} -c $name.c
+        \$(APXS) -I../../../apache2 -I../../../include $libs -llibhttpd 
$dversion -p -I$self->{cmodules_dir} -c $name.c
 
 clean:
        -erase @goners vc60.pdb 
@@ -91,7 +91,7 @@
 all: $lib
 
 $lib: $name.c
-       \$(APXS) -L../../../../library -I../.. -I../../../../include -lapreq2 
$dversion -I$self->{cmodules_dir} -c $name.c
+       \$(APXS) -L../../../../library -I../../../apache2 -I../../../../include 
-lapreq2 $dversion -I$self->{cmodules_dir} -c $name.c
 
 clean:
        -rm -rf $name.o $name.lo $name.slo $name.la .libs