You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-dev@httpd.apache.org by "Philip M. Gollucci" <pg...@p6m7g8.com> on 2005/09/09 07:57:29 UTC

[PATCH] glue/Makefile.am

@PERL_OPTS@ need to come before ARGUMENTS.

pgollucci@pgollucci.internal.liquidation.com /home/pgollucci/dev/repos/asf/httpd/apreq/trunk rv=0 122 >svn diff
Index: glue/Makefile.am
===================================================================
--- glue/Makefile.am    (revision 279710)
+++ glue/Makefile.am    (working copy)
@@ -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@

  perl_glue: perl/Makefile
         cd perl; $(MAKE)

-- 
END
------------------------------------------------------------
     What doesn't kill us can only make us stronger.
                 Nothing is impossible.
				
Philip M. Gollucci (pgollucci@p6m7g8.com) 301.254.5198
Consultant / http://p6m7g8.net/Resume/
Senior Developer / Liquidity Services, Inc.
   http://www.liquidityservicesinc.com
        http://www.liquidation.com
        http://www.uksurplus.com
        http://www.govliquidation.com
        http://www.gowholesale.com


Re: [PATCH] glue/Makefile.am

Posted by "Philip M. Gollucci" <pg...@p6m7g8.com>.
Joe Schaefer wrote:
> Thanks, applied.  However, shouldn't there also be a patch for
> Makefile.PL as well?
Yes, I always forget that as I always use ./configure.
I'll see what I can come up with.

-- 
END
------------------------------------------------------------
     What doesn't kill us can only make us stronger.
                 Nothing is impossible.
				
Philip M. Gollucci (pgollucci@p6m7g8.com) 301.254.5198
Consultant / http://p6m7g8.net/Resume/
Senior Developer / Liquidity Services, Inc.
   http://www.liquidityservicesinc.com
        http://www.liquidation.com
        http://www.uksurplus.com
        http://www.govliquidation.com
        http://www.gowholesale.com

Re: [PATCH] glue/Makefile.am

Posted by Joe Schaefer <jo...@sunstarsys.com>.
"Philip M. Gollucci" <pg...@p6m7g8.com> writes:

> I have more one minor change to make to this:
>
> The perl invoking build/version_check.pl also needs the @PERL_OPTS@
> to find the libraries.
>
> The below patch encompasses everything:

Thanks, applied.  However, shouldn't there also be a patch for
Makefile.PL as well?

-- 
Joe Schaefer


Re: [PATCH] glue/Makefile.am

Posted by "Philip M. Gollucci" <pg...@p6m7g8.com>.
I have more one minor change to make to this:

The perl invoking build/version_check.pl also needs the @PERL_OPTS@
to find the libraries.

The below patch encompasses everything:

Index: glue/Makefile.am
===================================================================
--- glue/Makefile.am    (revision 280240)
+++ glue/Makefile.am    (working copy)
@@ -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)
Index: acinclude.m4
===================================================================
--- acinclude.m4        (revision 280240)
+++ acinclude.m4        (working copy)
@@ -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)

-- 
END
------------------------------------------------------------
     What doesn't kill us can only make us stronger.
                 Nothing is impossible.
				
Philip M. Gollucci (pgollucci@p6m7g8.com) 301.254.5198
Consultant / http://p6m7g8.net/Resume/
Senior Developer / Liquidity Services, Inc.
   http://www.liquidityservicesinc.com
        http://www.liquidation.com
        http://www.uksurplus.com
        http://www.govliquidation.com
        http://www.gowholesale.com


Re: [PATCH] glue/Makefile.am

Posted by "Philip M. Gollucci" <pg...@p6m7g8.com>.
Actually its slightly more complicated then that.

PERL_OPTS come after perl but before ARGS.
ExtUtils::MakeMaker ARGS come after Makefile.PL

I'm going to all this trouble because I installed my mp2 libs outside of my perl lib tree.
Also, I'm trying to install libapreq2 outside of mp2 and perl lib trees.

Making my configure line now:

./configure \
  --with-perl-opts=-I$PREFIX/mp-2.0.2-dev/lib \
  --with-mm-opts="PREFIX=$PREFIX/libapreq-2.07-dev" \
  --enable-perl-glue \
  --enable-maintainer-mode \
  --with-perl=$PREFIX/perl-5.8.7/bin/perl \
  --with-apache2-apxs=$PREFIX/httpd-2.3.0/bin/apxs \
  --with-expat=/usr/local

New Patch follows:

pgollucci@pgollucci.internal.liquidation.com /home/pgollucci/dev/repos/asf/httpd/apreq/trunk rv=0 190 >svn diff
Index: glue/Makefile.am
===================================================================
--- glue/Makefile.am    (revision 279712)
+++ glue/Makefile.am    (working copy)
@@ -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)
Index: acinclude.m4
===================================================================
--- acinclude.m4        (revision 279712)
+++ acinclude.m4        (working copy)
@@ -28,8 +28,11 @@
                  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=""])
@@ -235,6 +238,7 @@

          AC_SUBST(PERL)
          AC_SUBST(PERL_OPTS)
+        AC_SUBST(MM_OPTS)
  ])

  dnl APR_CONFIG_NICE(filename)

-- 
END
------------------------------------------------------------
     What doesn't kill us can only make us stronger.
                 Nothing is impossible.
				
Philip M. Gollucci (pgollucci@p6m7g8.com) 301.254.5198
Consultant / http://p6m7g8.net/Resume/
Senior Developer / Liquidity Services, Inc.
   http://www.liquidityservicesinc.com
        http://www.liquidation.com
        http://www.uksurplus.com
        http://www.govliquidation.com
        http://www.gowholesale.com