X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=e838dba8a8a4125424eda80fb30d13c8a8eba8bb;hp=fcf613fd3bf0b8b40ce09a537d9e3994331caa90;hb=dbf7b94dbfd143f38e7e24132eca144474a65bfa;hpb=273b74fc2b199e9450a55b433df9b592b9fb4014

diff --git a/configure.ac b/configure.ac
index fcf613f..e838dba 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.5 2006-03-31 09:55:01 adam Exp $
+dnl $Id: configure.ac,v 1.12 2006-05-08 11:50:57 adam Exp $
 AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.16],[adam@indexdata.dk])
+AC_INIT([yaz],[2.1.19],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.8])
@@ -316,38 +316,138 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 	CC=$OCC
 	LIBS="$OLIBS $LIBTHREAD"
 fi
-dnl
-dnl ----- libXML2
-AC_SUBST(XML2_LIBS)
+
+dnl ----- libXSLT/libEXLT/libXML2
 AC_SUBST(XML2_CFLAGS)
+
 xml2dir=default
-AC_ARG_WITH(xml2, [  --with-xml2[=PREFIX]      use libxml2 in PREFIX],[xml2dir=$withval])
+AC_ARG_WITH(xml2,[[  --with-xml2[=PREFIX]    use libxml2 in PREFIX]],xml2dir=$withval)
+dnl -- if no PREFIX or not specified we just search in default locations
+dnl -- try pkg-config. If not found, use xml2-config
 if test "$xml2dir" = "yes" -o "$xml2dir" = "default"; then
-	for d in /usr /usr/local; do
-		if test -x $d/bin/xml2-config; then
-			xml2dir=$d
+	if test "$pkgconfigpath" != "NONE"; then
+		if $pkgconfigpath --exists libxml-2.0; then
+			pkgmodule="libxml-2.0"
 		fi
-	done
+	fi
+	if test -z "$pkgmodule"; then
+		for d in /usr /usr/local; do
+			if test -x $d/bin/xml2-config; then
+				xml2dir=$d
+			fi
+		done
+	fi
 fi
+dnl --- do the real check (pkg-config, xml2-config, not-found)
 if test "$xml2dir" != "no"; then
 	AC_MSG_CHECKING(for libXML2)
-	if test -x $xml2dir/bin/xml2-config; then
+	if test "$pkgmodule"; then
+		XML2_LIBS=`$pkgconfigpath --libs $pkgmodule`
+		XML2_CFLAGS=`$pkgconfigpath --cflags $pkgmodule`
+		XML2_VER=`$pkgconfigpath --modversion $pkgmodule`
+		AC_MSG_RESULT($XML2_VER)
+		AC_DEFINE(HAVE_XML2)
+	elif test -x $xml2dir/bin/xml2-config; then
 		XML2_LIBS=`$xml2dir/bin/xml2-config --libs`
-		LIBS="$XML2_LIBS $LIBS"
 		XML2_CFLAGS=`$xml2dir/bin/xml2-config --cflags`
 		XML2_VER=`$xml2dir/bin/xml2-config --version`
 		AC_MSG_RESULT($XML2_VER)
 		AC_DEFINE(HAVE_XML2)
 	else
-		AC_MSG_RESULT([Not found])
+		AC_MSG_RESULT(Not found)
+
 		if test "$xml2dir" = "default"; then
-			AC_MSG_WARN([Libxml2 development libraries not found.])
-			AC_MSG_WARN([YAZ will NOT support SRW/SRU.])
+			AC_MSG_WARN([libxml2 development libraries not found.])
+			AC_MSG_WARN([YAZ will NOT support SRU.])
 		else
-		        AC_MSG_ERROR([libXML2 development libraries not found.])
+		        AC_MSG_ERROR([libxml2 development libraries not found.])
 		fi
 	fi
 fi
+
+dnl ----- libXSLT
+xsltdir=default
+pkgmodule=""
+AC_ARG_WITH(xslt,[[  --with-xslt[=PREFIX]    use libXSLT in PREFIX]],xsltdir=$withval)
+
+dnl -- if no PREFIX or not specified we just search in default locations
+dnl -- try pkg-config. If not found, use xslt-config
+if test "$xsltdir" = "yes" -o "$xsltdir" = "default"; then
+	if test "$pkgconfigpath" != "NONE"; then
+	        # pkg-config on woody reports bad CFLAGS which does 
+		# not include libxml2 CFLAGS, so avoid it..
+		if $pkgconfigpath --atleast-version 1.1.0 libxslt; then
+			pkgmodule="libxslt"
+		fi
+	fi
+	if test -z "$pkgmodule"; then
+		for d in /usr /usr/local; do
+			if test -x $d/bin/xslt-config; then
+				xsltdir=$d
+			fi
+		done
+	fi
+fi
+dnl --- do the real check (pkg-config, xslt-config, not-found)
+if test "$xsltdir" != "no"; then
+	AC_MSG_CHECKING(for libXSLT)
+	if test "$pkgmodule"; then
+		XML2_LIBS=`$pkgconfigpath --libs $pkgmodule`
+		XML2_CFLAGS=`$pkgconfigpath --cflags $pkgmodule`
+		XSLT_VER=`$pkgconfigpath --modversion $pkgmodule`
+		AC_MSG_RESULT($XSLT_VER)
+		AC_DEFINE(HAVE_XSLT)
+	elif test -x $xsltdir/bin/xslt-config; then
+		XML2_LIBS=`$xsltdir/bin/xslt-config --libs`
+		XML2_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
+		XSLT_VER=`$xsltdir/bin/xslt-config --version`
+		AC_MSG_RESULT($XSLT_VER)
+		AC_DEFINE(HAVE_XSLT)
+	else
+		AC_MSG_RESULT(Not found)
+
+		if test "$xsltdir" = "default"; then
+			AC_MSG_WARN([libXSLT development libraries not found.])
+		else
+		        AC_MSG_ERROR([libXSLT development libraries not found.])
+		fi
+	fi
+fi
+
+dnl -- get libEXSLT. xslt-config is no good. So use pkg-config only
+exsltdir=default
+pkgmodule=""
+AC_ARG_WITH(exslt,[[  --with-exslt[=PREFIX]   use libEXSLT in PREFIX]],exsltdir=$withval)
+if test "$exsltdir" = "yes" -o "$exsltdir" = "default"; then
+	if test "$pkgconfigpath" != "NONE"; then
+		if $pkgconfigpath --exists libexslt; then
+			pkgmodule="libexslt"
+		fi
+	fi
+fi
+if test "$exsltdir" != "no"; then
+	AC_MSG_CHECKING(for libEXSLT)
+	if test "$pkgmodule"; then
+		XML2_LIBS=`$pkgconfigpath --libs $pkgmodule`
+		XML2_CFLAGS=`$pkgconfigpath --cflags $pkgmodule`
+		EXSLT_VER=`$pkgconfigpath --modversion $pkgmodule`
+		AC_MSG_RESULT($EXSLT_VER)
+		AC_DEFINE(HAVE_EXSLT)
+	else
+		AC_MSG_RESULT(Not found)
+
+		if test "$exsltdir" = "default"; then
+			AC_MSG_WARN([libEXSLT development libraries not found.])
+		else
+		        AC_MSG_ERROR([libEXSLT development libraries not found.])
+		fi
+	fi
+fi
+
+if test "$XML2_LIBS"; then
+	LIBS="$XML2_LIBS $LIBS"
+fi
+
 dnl
 dnl ------ Memory debugging
 AC_ARG_ENABLE(memdebug, [  --enable-memdebug       enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])
@@ -378,10 +478,11 @@ ztest/Makefile
 zoom/Makefile
 doc/Makefile
 doc/yaz.xml
-doc/yazhtml.dsl
-doc/yazprint.dsl
-doc/tkl.xsl
-doc/yazhtml.xsl
+doc/common/Makefile
+doc/common/html.dsl
+doc/common/html.xsl
+doc/common/print.dsl
+doc/common/tkl.xsl
 etc/Makefile
 yaz-config
 Doxyfile