X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=configure.ac;h=ae960fa16cf4adbe21a752546e18e960df047bae;hb=f3b9f5e6291ec8a4d29a379914ad875ec4872adc;hp=b733914d289d0b457e1d434e259a79ee13fbfac0;hpb=72c776b15ed8f48acb406c9a543bd808b3cfc5a3;p=idzebra-moved-to-github.git

diff --git a/configure.ac b/configure.ac
index b733914..ae960fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl Zebra, Index Data ApS, 1995-2006
-dnl $Id: configure.ac,v 1.13 2006-06-12 09:27:00 marc Exp $
+dnl $Id: configure.ac,v 1.16 2006-06-13 14:11:20 adam Exp $
 dnl
 AC_PREREQ(2.59)
-AC_INIT([idzebra],[1.4.0],[adam@indexdata.dk])
+AC_INIT([idzebra],[1.4.1],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE([1.8])
@@ -287,17 +287,20 @@ AC_DEFUN([ZEBRA_MODULE],[
 	   fi
         fi
 	m=`echo $1|tr .- __`
-	if test "$myen" = "shared"; then
+	if test "$myen" = "no" -o "$myen" = "disabled"; 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
+	elif test "$myen" = "static"; then
 	   AC_MSG_RESULT([static])
 	   STATIC_MODULE_OBJ="${STATIC_MODULE_OBJ} \$(mod_${m}_la_OBJECTS)"
 	   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