jerenkrantz 2002/09/17 10:33:44
Modified: . apu-config.in
Log:
Fix up APRUTIL_LIBNAME substitution.
Revision Changes Path
1.15 +6 -6 apr-util/apu-config.in
Index: apu-config.in
===================================================================
RCS file: /home/cvs/apr-util/apu-config.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- apu-config.in 10 Sep 2002 10:10:50 -0000 1.14
+++ apu-config.in 17 Sep 2002 17:33:44 -0000 1.15
@@ -68,7 +68,7 @@
INCLUDES="@APRUTIL_INCLUDES@"
LDFLAGS="@APRUTIL_LDFLAGS@"
-APRUTIL_LIBNAME="[EMAIL PROTECTED]@.la"
+APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
APU_SOURCE_DIR="@top_srcdir@"
APU_BUILD_DIR="@top_builddir@"
@@ -122,9 +122,9 @@
fi
if test "$location" = "installed"; then
- LA_FILE="$libdir/$APRUTIL_LIBNAME"
+ LA_FILE="$libdir/lib${APRUTIL_LIBNAME}.la"
else
- LA_FILE="$thisdir/$APRUTIL_LIBNAME"
+ LA_FILE="$thisdir/lib${APRUTIL_LIBNAME}.la"
fi
flags=""
@@ -172,9 +172,9 @@
--link-ld)
if test "$location" = "installed"; then
### avoid using -L if libdir is a "standard" location like /usr/lib
- flags="$flags -L$libdir -laprutil"
+ flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
else
- flags="$flags -L$thisdir [EMAIL PROTECTED]@"
+ flags="$flags -L$thisdir -l$APRUTIL_LIBNAME"
fi
;;
--link-libtool)
@@ -186,7 +186,7 @@
flags="$flags $LA_FILE"
elif test "$location" = "installed"; then
### avoid using -L if libdir is a "standard" location like /usr/lib
- flags="$flags -L$libdir [EMAIL PROTECTED]@"
+ flags="$flags -L$libdir -l$APRUTIL_LIBNAME"
else
flags="$flags $LA_FILE"
fi
