X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=1db5c8a9ff3f86d059908537e0e9532a23d91b14;hb=c6805b31fe5b18364344f39afb062bc220eea69a;hp=eb032b7816ee5bbe9a2c631fa9f325dc7ae1a48f;hpb=e1edb06bb88cb52c97073f3600afa2b371cbd1d7;p=idzebra-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index eb032b7..1db5c8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data ApS, 1995-2006
-dnl $Id: configure.ac,v 1.11 2006-06-07 20:50:23 adam Exp $
+dnl $Id: configure.ac,v 1.14 2006-06-12 23:46:21 adam Exp $
 dnl
 AC_PREREQ(2.59)
 AC_INIT([idzebra],[1.4.0],[adam@indexdata.dk])
@@ -34,7 +34,7 @@ else
 fi
 dnl
 dnl ------ YAZ
-YAZ_INIT($yazflag,2.1.19)
+YAZ_INIT($yazflag,2.1.20)
 YAZ_DOC
 dnl ----- libXSLT
 AC_SUBST(XSLT_LIBS)
@@ -287,7 +287,12 @@ AC_DEFUN([ZEBRA_MODULE],[
 	   fi
         fi
 	m=`echo $1|tr .- __`
-	if test "$myen" = "shared"; then
+	if test "$myen" = "no"; then
+	   AC_MSG_RESULT([disabled])
+	elif test "$2" = "disabled"; then
+	   AC_MSG_RESULT([disabled])
+	   AC_MSG_ERROR([Cannot enable mod-$1 because of missing libs (XML, etc)])
+	elif test "$myen" = "shared"; then
 	   AC_MSG_RESULT([shared])
 	   SHARED_MODULE_LA="${SHARED_MODULE_LA} mod-$1.la"
 	elif test "$myen" = "static" -o "$myen" = "yes"; then
@@ -296,8 +301,6 @@ AC_DEFUN([ZEBRA_MODULE],[
 	   STATIC_MODULE_LADD="${STATIC_MODULE_LADD} \$(mod_${m}_la_LADD)"
 	   modcpp=`echo $1|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`
 	   AC_DEFINE_UNQUOTED([IDZEBRA_STATIC_$modcpp])
-	elif test "$myen" = "no"; then
-	   AC_MSG_RESULT([disabled])
 	else
 	   AC_MSG_RESULT([$myen])
 	   AC_MSG_ERROR([invalid --enable-mod-$1 value. Use on,off,static or shared])
@@ -312,15 +315,15 @@ ZEBRA_MODULE(safari,shared,  [  --enable-mod-safari Safari filter (DBC)])
 if test "$ac_cv_header_expat_h" = "yes"; then
    def="shared"
 else
-   def="no"
+   def="disabled"
 fi
 ZEBRA_MODULE(grs-xml,[$def], [  --enable-mod-grs-xml    XML filter (Expat based)])
 if test "$XSLT_VER"; then
    def="shared"
 else
-   def="no"
+   def="disabled"
 fi
-ZEBRA_MODULE(alvis,[$def],   [  --enable-mod-alvis      ALVIS filter])
+ZEBRA_MODULE(alvis,[$def],   [  --enable-mod-alvis      ALVIS filter (Requires libxslt)])
 dnl ------ ANSI C Header files
 AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
@@ -362,7 +365,8 @@ AC_OUTPUT([
   test/espec/Makefile
   test/filters/Makefile
   examples/Makefile examples/gils/Makefile examples/zthes/Makefile
-  examples/marc21/Makefile examples/alvis-oai/Makefile
+  examples/marc21/Makefile examples/marcxml/Makefile 
+  examples/alvis-oai/Makefile
   idzebra.spec
   idzebra-config
   Doxyfile