httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r291436 - in /httpd/apreq/trunk: acinclude.m4 glue/Makefile.am
Date Sun, 25 Sep 2005 16:13:51 GMT
Author: joes
Date: Sun Sep 25 09:13:47 2005
New Revision: 291436

URL: http://svn.apache.org/viewcvs?rev=291436&view=rev
Log:
Add MakeMaker options flag.

Submitted by: Philip Gollucci

Modified:
    httpd/apreq/trunk/acinclude.m4
    httpd/apreq/trunk/glue/Makefile.am

Modified: httpd/apreq/trunk/acinclude.m4
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/acinclude.m4?rev=291436&r1=291435&r2=291436&view=diff
==============================================================================
--- httpd/apreq/trunk/acinclude.m4 (original)
+++ httpd/apreq/trunk/acinclude.m4 Sun Sep 25 09:13:47 2005
@@ -28,13 +28,16 @@
                 AC_HELP_STRING([--with-apache1-apxs],[path to apache1's apxs]),
                 [APACHE1_APXS=$withval],[APACHE1_APXS=""])
         AC_ARG_WITH(perl-opts,
-                AC_HELP_STRING([--with-perl-opts],[extra MakeMaker options]),
+                AC_HELP_STRING([--with-perl-opts],[extra PERL options]),
                 [PERL_OPTS=$withval],[PERL_OPTS=""])
+        AC_ARG_WITH(mm-opts,
+                AC_HELP_STRING([--with-mm-opts], [extra ExtUtils::MakeMaker options]),
+                [MM_OPTS=$withval], [MM_OPTS=""])
         AC_ARG_WITH(expat,
                 AC_HELP_STRING([--with-expat],[specify expat location]),
                 [EXPAT_DIR=$withval],[EXPAT_DIR=""])
 
-        prereq_check="$PERL build/version_check.pl"
+        prereq_check="$PERL $PERL_OPTS build/version_check.pl"
 
         if test -n "$APACHE2_SRC"; then
                 # no apxs: must compile httpd from source
@@ -235,6 +238,7 @@
 
         AC_SUBST(PERL)
         AC_SUBST(PERL_OPTS)
+        AC_SUBST(MM_OPTS)
 ])
 
 dnl APR_CONFIG_NICE(filename)

Modified: httpd/apreq/trunk/glue/Makefile.am
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/glue/Makefile.am?rev=291436&r1=291435&r2=291436&view=diff
==============================================================================
--- httpd/apreq/trunk/glue/Makefile.am (original)
+++ httpd/apreq/trunk/glue/Makefile.am Sun Sep 25 09:13:47 2005
@@ -6,7 +6,7 @@
 	cd perl; @PERL@ ../../build/xsbuilder.pl run
 
 perl/Makefile: perl/xsbuilder perl/Makefile.PL
-	cd perl; @PERL@ Makefile.PL -apxs @APACHE2_APXS@ @PERL_OPTS@
+	cd perl; @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
 
 perl_glue: perl/Makefile
 	cd perl; $(MAKE)



Mime
View raw message