blob: a932d52e29af90ac4a9bc1893842d8deb6c9a415 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
$NetBSD: patch-ab,v 1.1 2003/05/30 10:14:22 epg Exp $
--- apr-util/apu-config.in.orig Sat Mar 22 22:32:57 2003
+++ apr-util/apu-config.in
@@ -129,6 +129,9 @@ if test "$tmpbindir" = "$thisdir"; then
location=installed
elif test "$APU_SOURCE_DIR" = "$thisdir"; then
location=source
+elif echo "$thisdir" | grep buildlink > /dev/null 2>&1; then
+ location=buildlink
+ BUILDLINK_DIR="`dirname $thisdir`"
else
location=build
fi
@@ -139,6 +142,8 @@ if test "$location" = "installed"; then
LIBS=`echo "$LIBS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s $prefix/lib/libexpat.la -lexpat g"`
LDFLAGS=`echo "$LDFLAGS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g"`
INCLUDES=`echo "$INCLUDES" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s -I$prefix/lib g"`
+elif test "$location" = "buildlink"; then
+ LA_FILE="$BUILDLINK_DIR/lib/lib${APRUTIL_LIBNAME}.la"
else
LA_FILE="$thisdir/lib${APRUTIL_LIBNAME}.la"
fi
@@ -173,6 +178,8 @@ while test $# -gt 0; do
flags="$includedir"
elif test "$location" = "source"; then
flags="$APU_SOURCE_DIR/include"
+ elif test "$location" = "buildlink"; then
+ flags="$BUILDLINK_DIR/include/apr-${APRUTIL_MAJOR_VERSION}"
else
# this is for VPATH builds
flags="$thisdir/include $APU_SOURCE_DIR/include"
@@ -185,6 +192,8 @@ while test $# -gt 0; do
flags="$flags -I$includedir $INCLUDES"
elif test "$location" = "source"; then
flags="$flags -I$APU_SOURCE_DIR/include $INCLUDES"
+ elif test "$location" = "buildlink"; then
+ flags="$flags -I$BUILDLINK_DIR/include/apr-${APRUTIL_MAJOR_VERSION} $INCLUDES"
else
# this is for VPATH builds
flags="$flags -I$thisdir/include -I$APU_SOURCE_DIR/include $INCLUDES"
|
