Optional CCL module. Moved atoi_n to marcdisp.h from yaz-util.h.

[yaz-moved-to-github.git] / configure.in

diff --git a/configure.in b/configure.in
index 6e888a7..cd22775 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-dnl YAZ Toolkit, Index Data 1994-2000
+dnl YAZ Toolkit, Index Data 1994-2001
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.41 2001-03-20 15:58:23 adam Exp $
+dnl $Id: configure.in,v 1.44 2001-04-06 12:26:46 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
 AM_INIT_AUTOMAKE(yaz, 1.7)
 dnl
@@ -13,23 +13,33 @@ AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 dnl 
 dnl ----- yaz-comp: The Yaz Compiler
-AC_SUBST(ASNMODULE)
-AC_SUBST(ILLMODULE)
-AC_SUBST(ILLLIB)
+AC_SUBST(EXTRAMODULE)
+AC_SUBST(EXTRALIB)
 AC_ARG_ENABLE(comp,[  --disable-comp          use old encoders, i.e. disable the YAZ ASN.1 Compiler], , enable_comp=yes)
 if test "$enable_comp" = "yes"; then
-       ASNMODULE="z39.50"
-       ILLMODULE="ill"
-       ILLLIB=../ill/libill.la
-       ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
+       EXTRAMODULE="z39.50"
        HFILE=${srcdir}/include/yaz/z-proto.h
 else
-       ILLMODULE=""
-       ASNMODULE=asn
-       ILLLIB=""
-       ASN_MAKEFILES="asn/Makefile"
+       EXTRAMODULE=asn
        HFILE=${srcdir}/asn/prt-proto.h
 fi
+AC_ARG_ENABLE(modules,[  --enable-modules=\"mod ..\" ill],[
+if test "$enable_modules" != "no"; then
+               EXTRAMODULE="$EXTRAMODULE $enable_modules"
+fi
+],[
+EXTRAMODULE="$EXTRAMODULE ill ccl"
+])
+EXTRALIB=""
+echo $EXTRAMODULE
+for module in $EXTRAMODULE; do
+       EXTRALIB="$EXTRALIB ../$module/lib${module}.la"
+       if test $module = "z39.50"; then
+               module=z3950
+       fi
+       AC_DEFINE_UNQUOTED(YAZ_MODULE_${module})
+done
+       
 AC_MSG_CHECKING(whether proto.h needs to be generated)
 yaz_include=${srcdir}/include/yaz
 if test -r ${yaz_include}/proto.h && cmp -s $HFILE ${yaz_include}/proto.h; then
@@ -149,7 +159,7 @@ if test -f ${srcdir}/lib/yaz-config.in; then
 fi
 sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz-config.in >${srcdir}/lib/yaz-config.in
 dnl
-SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
+SUBDIRS_VAR="util odr $EXTRAMODULE zutil comstack tab retrieval server include lib client ztest"
 AC_SUBST(SUBDIRS_VAR)
 dnl ------ Makefiles
 dnl