X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=f8aa15972e167ef399962394fd80f2507ed9b521;hp=d55af6fbfa6c43fe2ca9b11756ee8685969680a1;hb=95d8bd04e10519a635972a24176270ef4dbe8d2c;hpb=fd3508c19a217ebd059552cc301c76d203d03524

diff --git a/configure.ac b/configure.ac
index d55af6f..f8aa159 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.10 2006-05-03 12:02:23 adam Exp $
+dnl $Id: configure.ac,v 1.13 2006-05-08 12:20:48 adam Exp $
 AC_PREREQ(2.59)
 AC_INIT([yaz],[2.1.19],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
@@ -317,46 +317,17 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 	LIBS="$OLIBS $LIBTHREAD"
 fi
 
-dnl ----- libXSLT
-AC_SUBST(XSLT_CFLAGS)
+dnl ----- libXSLT/libEXLT/libXML2
 AC_SUBST(XML2_CFLAGS)
-xsltdir=default
-AC_ARG_WITH(xslt,[[  --with-xslt[=PREFIX]    use libxslt in PREFIX]],xsltdir=$withval)
-if test "$xsltdir" = "yes" -o "$xsltdir" = "default"; then
-	for d in /usr /usr/local; do
-		if test -x $d/bin/xslt-config; then
-			xsltdir=$d
-		fi
-	done
-fi
-if test "$xsltdir" != "no"; then
-	AC_MSG_CHECKING(for libXSLT)
-	if test -x $xsltdir/bin/xslt-config; then
-		XSLT_LIBS=`$xsltdir/bin/xslt-config --libs`
-		XSLT_CFLAGS=`$xsltdir/bin/xslt-config --cflags`
-		XML2_CFLAGS=$XSLT_CFLAGS
-		XSLT_VER=`$xsltdir/bin/xslt-config --version`
-		LIBS="$XSLT_LIBS $LIBS"
-		AC_MSG_RESULT($XSLT_VER)
-		AC_DEFINE(HAVE_XSLT)
-		AC_DEFINE(HAVE_XML2)
-	else
-		AC_MSG_RESULT(Not found)
 
-		if test "$xsltdir" = "default"; then
-			AC_MSG_WARN([libxslt development libraries not found.])
-			AC_MSG_WARN([YAZ will NOT support SRU.])
-		else
-		        AC_MSG_ERROR([libxslt development libraries not found.])
-		fi
-	fi
-fi
+YAZ_LIBXML2
+YAZ_LIBXSLT
+YAZ_LIBEXSLT
 
-xml2dir=default
-AC_ARG_WITH(xml2,[[  --with-xml2[=PREFIX]    OBSOLETE. Use --with-xslt instead]],xml2dir=$withval)
-if test "$xml2dir" != "default"; then
-        AC_MSG_ERROR([--with-xml2 OBSOLETE. Use --with-xslt instead.])
+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])