diff --git a/src/configure.in b/src/configure.in
index bb74d68143b2c56bb1021637ea37e329f022047c..b413fe607821cd26f1552fa41f5264df509b67e9 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.1045 2008/03/04 18:34:32 grubba Exp $")
+AC_REVISION("$Id: configure.in,v 1.1046 2008/03/04 19:10:55 grubba Exp $")
 AC_INIT(interpret.c)
 AC_CONFIG_HEADER(machine.h)
 
@@ -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.1045 2008/03/04 18:34:32 grubba Exp $.
+# Automatically generated by $Id: configure.in,v 1.1046 2008/03/04 19:10:55 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.1045 2008/03/04 18:34:32 grubba Exp $.
+# Automatically generated by $Id: configure.in,v 1.1046 2008/03/04 19:10:55 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.1045 2008/03/04 18:34:32 grubba Exp $.
+# Automatically generated by $Id: configure.in,v 1.1046 2008/03/04 19:10:55 grubba Exp $.
 # RNTCL-version. Do NOT edit.
 sed -e "$PIKE_PATH_TRANSLATE"
 EOF
@@ -8475,6 +8475,14 @@ $bundle_info])
       fi
       $RANLIB $f
     done
+    # 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
     # Clear the caches.
     echo Clearing cached variables related to the bundles.
     for varname in `cat $bundle_info|sed -e 's/^[[ 	]]*//'|sort|uniq` no; do