2009-03-30 Tollef Fog Heen <tfheen@err.no>

	* check/common, check/config.sh.in, check/Makefile.am,
	configure.in: Make it possible to check for configure variables in
	the check scripts.  So far, only direct/indirect is exposed.

diff --git a/ChangeLog b/ChangeLog
index 40869bfb0d0bb5cea66332164616f36144c5957e..21115f0bebb05a01f718e5a69edd700f07bd393b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-03-30  Tollef Fog Heen  <tfheen@err.no>
 
+       * check/common, check/config.sh.in, check/Makefile.am,
+       configure.in: Make it possible to check for configure variables in
+       the check scripts.  So far, only direct/indirect is exposed.
+
        * pkg.c (add_virtual_pkgconfig_package): Add pc_path as a variable
        which you can use to get at the compiled-in PKG_CONFIG_PC_PATH.
 

diff --git a/check/Makefile.am b/check/Makefile.am
index 072851411a5a46a50b863b219713ef7645fee962..1d0d558d100ae2c5e2fdd5b57b9a93d1069a5455 100644 (file)
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -7,3 +7,4 @@ EXTRA_DIST = $(TESTS) common simple.pc requires-test.pc public-dep.pc   \
        private-dep.pc includedir.pc missing-requires-private.pc \
        missing-requires.pc
 
+DISTCLEANFILES = config.sh

diff --git a/check/common b/check/common
index fdbc845fb64757926b3c75a64ddbd140fe228609..5cf772d59118dcb715284e97fecb27b253b07c39 100644 (file)
--- a/check/common
+++ b/check/common
@@ -6,6 +6,8 @@
 
 pkgconfig=../pkg-config
 
+. config.sh
+
 PKG_CONFIG_PATH=$srcdir
 export PKG_CONFIG_PATH
 export LC_ALL=C

diff --git a/check/config.sh.in b/check/config.sh.in
new file mode 100644 (file)
index 0000000..de00780
--- /dev/null
+++ b/check/config.sh.in
@@ -0,0 +1,5 @@
+#
+# Settings from the configure script
+#
+
+export list_indirect_deps=@use_indirect_deps@

diff --git a/configure.in b/configure.in
index d118cc65a304ea8d45e484dec4893a2b4e88a196..f7a424c541d17cccc6b764d25e9c93950063a28c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -77,6 +77,7 @@ fi
 AC_SUBST(WARN_CFLAGS)
 
 AC_DEFINE_UNQUOTED(ENABLE_INDIRECT_DEPS, `test $use_indirect_deps = no; echo $?`, [Link library to all dependent libraries, not only directly needed ones])
+AC_SUBST(use_indirect_deps)
 
 AC_MSG_CHECKING([for Win32])
 case "$host" in
@@ -139,4 +140,6 @@ AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(setresuid setreuid,break)
 AC_CHECK_HEADERS([dirent.h unistd.h sys/wait.h malloc.h])
 
-AC_OUTPUT([Makefile check/Makefile])
+AC_OUTPUT([Makefile
+          check/Makefile
+          check/config.sh])