-AC_PROG_RANLIB
-dnl
-dnl ----- YC: The Yaz Compiler
-AC_SUBST(ASNMODULE)
-AC_ARG_WITH(yc,[ --with-yc compile using YC: The Yaz Compiler], [YCDIR=$withval],[YCDIR=""])
-if test "$YCDIR" = "yes"; then
- ASNMODULE="z39.50"
- cp -f include/z-proto.h include/proto.h
+AM_DISABLE_SHARED
+AM_PROG_LIBTOOL
+dnl
+dnl ----- yaz-comp: The Yaz Compiler
+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
+ EXTRAMODULE="z39.50"
+ HFILE=${srcdir}/include/yaz/z-proto.h
+else
+ 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=""
+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
+ AC_MSG_RESULT(no)