Index: configure
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: autoconf/ast_ext_lib.m4
===================================================================
--- autoconf/ast_ext_lib.m4	(revision 298480)
+++ autoconf/ast_ext_lib.m4	(working copy)
@@ -99,13 +99,26 @@
       	 pbxlibdir="-L${$1_DIR}"
       fi
    fi
+   if test "${PKGCONFIG}" = ""; then
+      AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
+   fi
+   ast_ext_lib_check_addl_CPPFLAGS=""
+   ast_ext_lib_check_addl_CFLAGS=""
+   ast_ext_lib_check_addl_LIBS=""
+   if test "$PKGCONFIG" != "No"; then
+      if $PKGCONFIG --exists $2; then
+         ast_ext_lib_check_addl_CPPFLAGS=`$PKGCONFIG --cflags-only-I $2`
+         ast_ext_lib_check_addl_CFLAGS=`$PKGCONFIG --cflags $2`
+         ast_ext_lib_check_addl_LIBS=`$PKGCONFIG --libs $2`
+      fi
+   fi
    pbxfuncname="$3"
    if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
       AST_$1_FOUND=yes
    else
       ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
-      CFLAGS="${CFLAGS} $6"
-      AC_CHECK_LIB([$2], [${pbxfuncname}], [AST_$1_FOUND=yes], [AST_$1_FOUND=no], [${pbxlibdir} $5])
+      CFLAGS="${CFLAGS} ${ast_ext_lib_check_addl_CFLAGS} $6"
+      AC_CHECK_LIB([$2], [${pbxfuncname}], [AST_$1_FOUND=yes], [AST_$1_FOUND=no], [${pbxlibdir} ${ast_ext_lib_check_addl_LIBS} $5])
       CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
    fi
 
@@ -121,7 +134,7 @@
          $1_HEADER_FOUND="1"
       else				# check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
-         CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
+         CPPFLAGS="${CPPFLAGS} ${ast_ext_lib_check_addl_CPPFLAGS} ${$1_INCLUDE}"
          AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
          CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
       fi