From 9d9fe911b263cc7fc3728b1a6a8d60b43661a8e0 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Sat, 15 Jul 2000 18:08:58 +0000 Subject: [PATCH] add 6th parameter for now git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8678 ec53bebd-3082-4978-b11e-865c3cabbd6b --- cf/test-package.m4 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cf/test-package.m4 b/cf/test-package.m4 index 89b0c658b..ee5158bee 100644 --- a/cf/test-package.m4 +++ b/cf/test-package.m4 @@ -1,6 +1,6 @@ dnl $Id$ dnl -dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations) +dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional) AC_DEFUN(AC_TEST_PACKAGE,[AC_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)]) @@ -74,7 +74,9 @@ if test "$ires" -a "$lres" -a "$with_$1" != "no"; then $1_libdir="$lres" INCLUDE_$1="-I$$1_includedir" LIB_$1="-L$$1_libdir $3" - AC_DEFINE_UNQUOTED(upcase($1),1,[Define if you have the $1 package.]) + ifval([$6], + AC_DEFINE_UNQUOTED($6,1,[Define if you have the $1 package.]), + AC_DEFINE_UNQUOTED(upcase($1),1,[Define if you have the $1 package.])) with_$1=yes AC_MSG_RESULT([headers $ires, libraries $lres]) else @@ -83,6 +85,9 @@ else with_$1=no AC_MSG_RESULT($with_$1) fi +dnl ifval([$6], +dnl AM_CONDITIONAL($6, test "$with_$1" = yes) +dnl AM_CONDITIONAL(upcase($1), test "$with_$1" = yes)) AC_SUBST(INCLUDE_$1) AC_SUBST(LIB_$1) ])