wsanchez 2002/09/24 21:38:15
Modified: . apu-config.in
Log:
LIBS isn't the only variable in which we want the installed version of
apu-config to print the installed path names and not the ones in the
source tree.
Revision Changes Path
1.19 +9 -8 apr-util/apu-config.in
Index: apu-config.in
===================================================================
RCS file: /home/cvs/apr-util/apu-config.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apu-config.in 25 Sep 2002 04:19:16 -0000 1.18
+++ apu-config.in 25 Sep 2002 04:38:15 -0000 1.19
@@ -110,20 +110,24 @@
thisdir="`dirname $0`"
thisdir="`cd $thisdir && pwd`"
if test -d $bindir; then
- tmpbindir="`cd $bindir && pwd`"
+ tmpbindir="`cd $bindir && pwd`"
else
- tmpbindir=""
+ tmpbindir=""
fi
if test "$tmpbindir" = "$thisdir"; then
- location=installed
+ location=installed
elif test "$APU_SOURCE_DIR" = "$thisdir"; then
- location=source
+ location=source
else
- location=build
+ location=build
fi
if test "$location" = "installed"; then
LA_FILE="$libdir/lib${APRUTIL_LIBNAME}.la"
+
+ LIBS=`echo "$LIBS" | sed "s $APU_BUILD_DIR/xml/expat $prefix g"`
+ LDFLAGS=`echo "$LDFLAGS" | sed "s $APU_BUILD_DIR/xml/expat $prefix g"`
+ INCLUDES=`echo "$INCLUDES" | sed "s $APU_BUILD_DIR/xml/expat $prefix g"`
else
LA_FILE="$thisdir/lib${APRUTIL_LIBNAME}.la"
fi
@@ -151,9 +155,6 @@
exit 0
;;
--libs)
- if test "$location" = "installed" && test -f $prefix/lib/libexpat.la;
then
- LIBS=`echo "$LIBS" | sed "s $APU_BUILD_DIR/xml/expat $prefix g"`
- fi
flags="$flags $LIBS"
;;
--includes)
