You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2005/04/11 15:00:51 UTC

svn commit: r160870 - httpd/apreq/branches/multi-env-unstable/acinclude.m4

Author: joes
Date: Mon Apr 11 06:00:49 2005
New Revision: 160870

URL: http://svn.apache.org/viewcvs?view=rev&rev=160870
Log:
Add --with-expat=DIR option.

Reviewed by: joes
Submitted by: Philip M. Gollucci

Modified:
    httpd/apreq/branches/multi-env-unstable/acinclude.m4

Modified: httpd/apreq/branches/multi-env-unstable/acinclude.m4
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/acinclude.m4?view=diff&r1=160869&r2=160870
==============================================================================
--- httpd/apreq/branches/multi-env-unstable/acinclude.m4 (original)
+++ httpd/apreq/branches/multi-env-unstable/acinclude.m4 Mon Apr 11 06:00:49 2005
@@ -30,6 +30,9 @@
         AC_ARG_WITH(perl-opts,
                 AC_HELP_STRING([--with-perl-opts],[extra MakeMaker options]),
                 [PERL_OPTS=$withval],[PERL_OPTS=""])
+        AC_ARG_WITH(expat,
+                AC_HELP_STRING([--with-expat],[specify expat location]),
+                [PERL_OPTS=$withval],[PERL_OPTS=""])
 
         prereq_check="$PERL build/version_check.pl"
 
@@ -155,6 +158,11 @@
         APR_ADDTO([APR_LIBS], "`$APR_CONFIG --libs`")
         APR_ADDTO([APR_LDFLAGS], "`$APU_CONFIG --link-ld --ldflags`")
         APR_ADDTO([APR_LDFLAGS], "`$APR_CONFIG --link-ld --ldflags`")
+
+        if test -n "$EXPAT_DIR"; then
+            APR_ADDTO([APR_INCLUDES], "-I$EXPAT_DIR/include")
+            APR_ADDTO([APR_LTFLAGS], "-L$EXPAT_DIR/lib")
+        fi
 
         dnl Absolute source/build directory
         abs_srcdir=`(cd $srcdir && pwd)`



Re: svn commit: r160870 - httpd/apreq/branches/multi-env-unstable/acinclude.m4

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

> Shouldn't that set EXPAT_DIR and not PERL_OPTS
> my original patch was
> +                               [EXPAT_DIR=$withval],[EXPAT_DIR=""])

Oops, good spot.  The patch you submitted to the
list was munged (bogus line wrap I think), so I tried
applying it by hand.  Looks like I goofed that up.

>
> I'm by no means a autotools guru....

Join the club!

-- 
Joe Schaefer


Re: svn commit: r160870 - httpd/apreq/branches/multi-env-unstable/acinclude.m4

Posted by "Philip M. Gollucci" <pg...@p6m7g8.com>.
http://svn.apache.org/viewcvs/httpd/apreq/branches/multi-env-unstable/acinclude.m4?view=diff&r1=160869&r2=160870

>==============================================================================
>--- httpd/apreq/branches/multi-env-unstable/acinclude.m4 (original)
>+++ httpd/apreq/branches/multi-env-unstable/acinclude.m4 Mon Apr 11 06:00:49 2005
>@@ -30,6 +30,9 @@
>         AC_ARG_WITH(perl-opts,
>                 AC_HELP_STRING([--with-perl-opts],[extra MakeMaker options]),
>                 [PERL_OPTS=$withval],[PERL_OPTS=""])
>+        AC_ARG_WITH(expat,
>+                AC_HELP_STRING([--with-expat],[specify expat location]),
>+                [PERL_OPTS=$withval],[PERL_OPTS=""])
> 
>         prereq_check="$PERL build/version_check.pl"
> 
>@@ -155,6 +158,11 @@
>         APR_ADDTO([APR_LIBS], "`$APR_CONFIG --libs`")
>         APR_ADDTO([APR_LDFLAGS], "`$APU_CONFIG --link-ld --ldflags`")
>         APR_ADDTO([APR_LDFLAGS], "`$APR_CONFIG --link-ld --ldflags`")
>+
>+        if test -n "$EXPAT_DIR"; then
>+            APR_ADDTO([APR_INCLUDES], "-I$EXPAT_DIR/include")
>+            APR_ADDTO([APR_LTFLAGS], "-L$EXPAT_DIR/lib")
>+        fi
> 
>         dnl Absolute source/build directory
>         abs_srcdir=`(cd $srcdir && pwd)`
>  
>

+        AC_ARG_WITH(expat,
+                AC_HELP_STRING([--with-expat],[specify expat location]),
+                [PERL_OPTS=$withval],[PERL_OPTS=""])

Shouldn't that set EXPAT_DIR and not PERL_OPTS
my original patch was
+                               [EXPAT_DIR=$withval],[EXPAT_DIR=""])

I'm by no means a autotools guru....

I'll retest it tonightish...

Thanks!

-- 
END
-----------------------------------------------------------------------------
Philip M. Gollucci
Senior Developer - Liquidity Services Inc.
Phone:  202.568.6268 (Direct)
E-Mail: pgollucci@liquidation.com
Web:    http://www.liquidation.com