add 6th parameter for now
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8678 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
dnl $Id$
|
dnl $Id$
|
||||||
dnl
|
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)])
|
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"
|
$1_libdir="$lres"
|
||||||
INCLUDE_$1="-I$$1_includedir"
|
INCLUDE_$1="-I$$1_includedir"
|
||||||
LIB_$1="-L$$1_libdir $3"
|
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
|
with_$1=yes
|
||||||
AC_MSG_RESULT([headers $ires, libraries $lres])
|
AC_MSG_RESULT([headers $ires, libraries $lres])
|
||||||
else
|
else
|
||||||
@@ -83,6 +85,9 @@ else
|
|||||||
with_$1=no
|
with_$1=no
|
||||||
AC_MSG_RESULT($with_$1)
|
AC_MSG_RESULT($with_$1)
|
||||||
fi
|
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(INCLUDE_$1)
|
||||||
AC_SUBST(LIB_$1)
|
AC_SUBST(LIB_$1)
|
||||||
])
|
])
|
||||||
|
Reference in New Issue
Block a user