diff options
Diffstat (limited to 'cf/test-package.m4')
| -rw-r--r-- | cf/test-package.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cf/test-package.m4 b/cf/test-package.m4 index 3bc079488..8e694bbcb 100644 --- a/cf/test-package.m4 +++ b/cf/test-package.m4 @@ -1,7 +1,7 @@ dnl $Id$ dnl dnl rk_TEST_PACKAGE(package,headers,libraries,extra libs, -dnl default locations, conditional, config-program) +dnl default locations, conditional, config-program, headers) AC_DEFUN([rk_TEST_PACKAGE],[ AC_ARG_WITH($1, @@ -91,6 +91,7 @@ if test "$with_$1" != no; then if test "$[]$1_cflags" -a "$[]$1_libs"; then CFLAGS="$[]$1_cflags $save_CFLAGS" LIBS="$[]$1_libs $save_LIBS" + m4_ifval([$8],[AC_CHECK_HEADERS([[$8]])]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[ INCLUDE_$1="$[]$1_cflags" LIB_$1="$[]$1_libs" @@ -101,6 +102,7 @@ if test "$with_$1" != no; then ires= lres= for i in $header_dirs; do CFLAGS="-I$i $save_CFLAGS" + m4_ifval([$8],[AC_CHECK_HEADERS([[$8]])]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[ires=$i;break]) done for i in $lib_dirs; do |