You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2002/01/18 19:16:54 UTC
cvs commit: httpd-2.0 configure.in
jerenkrantz 02/01/18 10:16:54
Modified: . configure.in
Log:
Per Ian's change, add the APRUTIL_EXPORT_INCLUDES vars to our environment.
Revision Changes Path
1.197 +1 -0 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- configure.in 30 Dec 2001 14:05:55 -0000 1.196
+++ configure.in 18 Jan 2002 18:16:54 -0000 1.197
@@ -405,6 +405,7 @@
dnl get the exported vars from APRUTIL
. ./srclib/apr-util/export_vars.sh
APR_ADDTO(LIBS, $APRUTIL_EXPORT_LIBS)
+APR_ADDTO(INCLUDES, $APRUTIL_EXPORT_INCLUDES)
AP_LIBS="$AP_LIBS $LIBTOOL_LIBS"
dnl ## Finalize the variables
Re: cvs commit: httpd-2.0 configure.in
Posted by Justin Erenkrantz <je...@ebuilt.com>.
On Fri, Jan 18, 2002 at 06:16:54PM -0000, jerenkrantz@apache.org wrote:
> jerenkrantz 02/01/18 10:16:54
>
> Modified: . configure.in
> Log:
> Per Ian's change, add the APRUTIL_EXPORT_INCLUDES vars to our environment.
I told Ian that I'd switch httpd-2.0 to use apu-config instead
(which is why he didn't change httpd-2.0 over). However, I chickened
out because I'm not terribly happy with this segment in apu-config:
--libs)
if [ -f $PREFIX/lib/libexpat.la ] ; then
TMP_SRCDIR=`echo "$TOP_SRCDIR/xml/expat" | sed 's/\\//\\\\\\//g'`
TMP_PREFIX=`echo $PREFIX | sed 's/\\//\\\\\\//g'`
LIBS=`echo "$LIBS" | sed "s/$TMP_SRCDIR/$TMP_PREFIX/g"`
fi
echo "$LIBS"
;;
The issue is that when APR-util is *not* installed, we want to tell
libtool to use the .la in our source directory, but if we *are*
installed, we want to use the .la in our installed location.
Currently, APRUTIL_EXPORT_LIBS points to the *full* source dir path
to expat.
So, if you have a previous installation of libexpat.la in
$prefix/lib and use apu-config, we'll link to that instead of the
one in the source dir. This may not be ideal.
If anyone has any ideas, they'd be appreciated. What is there now
is a bit of a hack. It works, but... -- justin