X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=fc0c36042bdf3a0cec183514d51b802306e89ed6;hb=5d73d6c1e27e6c2431c852fe99f025433a8a822b;hp=684b43a0fb0ce4abf8765c8d7796ae526aa52e1c;hpb=0920106c1999d6628e21f42f2109dc1b18fbe58c;p=yaz-moved-to-github.git diff --git a/configure.ac b/configure.ac index 684b43a..fc0c360 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl YAZ Toolkit, Index Data 1994-2006 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.27 2006-06-27 12:23:11 adam Exp $ +dnl $Id: configure.ac,v 1.36 2006-09-04 12:09:53 adam Exp $ AC_PREREQ(2.59) -AC_INIT([yaz],[2.1.23],[adam@indexdata.dk]) +AC_INIT([yaz],[2.1.29],[adam@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE([1.8]) @@ -164,7 +164,7 @@ if test "$with_iconv" != "no"; then ]) fi dnl ------ various functions -AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r localtime_r usleep fopen64) +AC_CHECK_FUNCS(getaddrinfo vsnprintf gettimeofday poll strerror_r localtime_r usleep fopen64) case $host in *-*-darwin*) trypoll="no"; @@ -321,10 +321,30 @@ fi dnl ----- libXSLT/libEXLT/libXML2 AC_SUBST(XML2_CFLAGS) +AC_SUBST(YAZ_CONFIG_CFLAGS) +YAZ_CONFIG_CFLAGS="" -YAZ_LIBXML2 -YAZ_LIBXSLT -YAZ_LIBEXSLT +YAZ_LIBXML2( + [ + AC_DEFINE(YAZ_HAVE_XML2) + YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XML2=1" + ] +) + +YAZ_LIBXSLT( + [ + AC_DEFINE(YAZ_HAVE_XSLT) + YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XSLT=1" + ] +) +YAZ_LIBEXSLT( + [ + AC_DEFINE(YAZ_HAVE_EXSLT) + YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1" + ] +) + +YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS $XML2_CFLAGS" if test "$XML2_LIBS"; then LIBS="$XML2_LIBS $LIBS"