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.
This commit is contained in:
Tollef Fog Heen 2009-03-30 21:50:01 +02:00
parent e170895bc6
commit f37f04a78a
5 changed files with 16 additions and 1 deletions

View file

@ -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.

View file

@ -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

View file

@ -6,6 +6,8 @@
pkgconfig=../pkg-config
. config.sh
PKG_CONFIG_PATH=$srcdir
export PKG_CONFIG_PATH
export LC_ALL=C

5
check/config.sh.in Normal file
View file

@ -0,0 +1,5 @@
#
# Settings from the configure script
#
export list_indirect_deps=@use_indirect_deps@

View file

@ -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])