From 4f80cf3d3db680c6f6fdfed4be858b5ef3b86d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Wed, 5 Mar 2008 22:29:25 +0100
Subject: [PATCH] Improved support for bundles using pkg-config.
Rev: src/configure.in:1.1048
---
src/configure.in | 29 ++++++++++-------------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/src/configure.in b/src/configure.in
index aa09b27c86..71812dc717 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.1047 2008/03/05 13:16:10 grubba Exp $")
+AC_REVISION("$Id: configure.in,v 1.1048 2008/03/05 21:29:25 grubba Exp $")
AC_INIT(interpret.c)
AC_CONFIG_HEADER(machine.h)
@@ -1330,7 +1330,7 @@ if test "$with_bundles" = "no"; then :; else
pike_bundle_dir=`cd "$srcdir/../bundles" && pwd`
fi
fi
-test -d bundles/. || mkdir bundles;
+test -d bundles/. || mkdir bundles
if test -d bundles/.; then
touch bundles/no_testsuites
pike_bundle_prefix="`pwd`/bundles"
@@ -1344,13 +1344,13 @@ if test -d bundles/.; then
touch "bundles/lib$d/keep"
LDFLAGS="$LDFLAGS -L$pike_bundle_prefix/lib$d"
done
- if test -d bundles/lib/pkgconfig/.; then
- for pc in `find bundles/lib/pkgconfig/. -name '*.pc'`; do
- CPPFLAGS="$CPPFLAGS `for x in \`sed -e '/^$/q' < "$pc"\`; do eval $x; done; eval \`sed -ne 's/^Cflags: /echo /p' < "$pc"\``"
- done
+ test -d bundles/lib/pkgconfig/. || mkdir bundles/lib/pkgconfig
+ if test "x$PKG_CONFIG_PATH" = "x"; then
+ PKG_CONFIG_PATH="${pike_bundle_prefix}/lib/pkgconfig"
else
- :
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${pike_bundle_prefix}/lib/pkgconfig"
fi
+ export PKG_CONFIG_PATH
fi
export pike_bundle_dir
export pike_bundle_prefix
@@ -2361,7 +2361,7 @@ if test "x$PIKE_PATH_TRANSLATE" = "x"; then
# MinGW system.
cat <<\EOF
#!/bin/sh
-# Automatically generated by $Id: configure.in,v 1.1047 2008/03/05 13:16:10 grubba Exp $.
+# Automatically generated by $Id: configure.in,v 1.1048 2008/03/05 21:29:25 grubba Exp $.
# MinGW-version. Do NOT edit.
posix_name="`cat`"
posix_prefix="/"
@@ -2399,7 +2399,7 @@ EOF
# Native POSIX system.
cat <<\EOF
#!/bin/sh
-# Automatically generated by $Id: configure.in,v 1.1047 2008/03/05 13:16:10 grubba Exp $.
+# Automatically generated by $Id: configure.in,v 1.1048 2008/03/05 21:29:25 grubba Exp $.
# POSIX-version. Do NOT edit.
cat
EOF
@@ -2408,7 +2408,7 @@ else
# rntcl-style
cat <<\EOF
#!/bin/sh
-# Automatically generated by $Id: configure.in,v 1.1047 2008/03/05 13:16:10 grubba Exp $.
+# Automatically generated by $Id: configure.in,v 1.1048 2008/03/05 21:29:25 grubba Exp $.
# RNTCL-version. Do NOT edit.
sed -e "$PIKE_PATH_TRANSLATE"
EOF
@@ -8449,15 +8449,6 @@ $bundle_info])
# Done.
echo "Bundle $bundle installed successfully."
) || exit 1
-
- # Update with flags from pkgconfig.
- pc="${pike_bundle_prefix}/lib/pkgconfig/$bundle.pc"
- if test -f "$pc"; then
- echo "Updating CPPFLAGS with stuff from pkgconfig."
- CPPFLAGS="$CPPFLAGS `for x in \`sed -e '/^$/q' < "$pc"\`; do eval $x; done; eval \`sed -ne 's/^Cflags: /echo /p' < "$pc"\``"
- else
- :
- fi
fi
done
echo "Fixing libraries..."
--
GitLab