Merge branch 'sxe_pc_check' into for-steve

diff --git a/Makefile.am b/Makefile.am
index d6e7cbf..1cefe3a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,7 @@ sxe_subdirs += lib-src
 if DESCEND_MODULES
 sxe_subdirs += modules
 endif
-sxe_subdirs += src lisp src lisp info etc tests
+sxe_subdirs += src lisp info etc tests
 
 SUBDIRS =
 SUBDIRS += $(sxe_subdirs)

diff --git a/configure.ac b/configure.ac
index 432db05..a680427 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3021,6 +3021,17 @@ fi
 ## Since almost any of the below tests uses pkgconfig we make a
 ## once-for-all-times check now
 SXE_SEARCH_CONFIG_PROG([pkg-config])
+if test "$have_pkg_config" = "yes" -a -n "$with_site_prefixes"; then
+       for dir in $with_site_prefixes; do
+               pkgcfg_dir="${dir}/lib/pkgconfig"
+               if test -n "$PKG_CONFIG_PATH"; then
+                  PKG_CONFIG_PATH="$PKG_CONFIG_PATH":"$pkgcfg_dir"
+               else
+                  PKG_CONFIG_PATH="$pkgcfg_dir"
+               fi
+       done
+       export PKG_CONFIG_PATH
+fi
 
 dnl libsndfile support
 if test "$with_media_sndfile" != "no"; then

diff --git a/info/Makefile.am b/info/Makefile.am
index 7449556..12f2219 100644 (file)
--- a/info/Makefile.am
+++ b/info/Makefile.am
@@ -25,6 +25,11 @@
 LANG=C
 LC_ALL=C
 
+builddir = @builddir@
+srcdir = @srcdir@
+
+SUBDIRS=
+
 info_TEXINFOS =
 info_TEXINFOS += cl.texi
 info_TEXINFOS += custom.texi