X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=355dfc06a67acfd5450c07b54ce478ae99d3861f;hb=6d04fc7a64ab1dd82574935bb189e055fe2d5e72;hp=5e6d0c0c60ec07acaccac703a98e364104d98b5d;hpb=d205d4870b1d64af05e9d6f6a2223086af4cce9e;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 5e6d0c0..355dfc0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,33 +1,40 @@
 dnl YAZ Toolkit
-dnl (c) Index Data 1994-1999
+dnl (c) Index Data 1994-2000
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.14 1999-12-16 23:36:19 adam Exp $
+dnl $Id: configure.in,v 1.22 2000-03-02 08:48:20 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
+AM_INIT_AUTOMAKE(yaz, 1.6)
 dnl
 dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
+AC_CHECK_PROGS(have_sgml2txt,sgml2txt,no)
+AC_CHECK_PROGS(have_sgml2latex,sgml2latex,no)
+AC_CHECK_PROGS(have_sgml2html,sgml2html,no)
+if test "$have_sgml2txt" = "no" -o "$have_sgml2latex" = "no" -o "$have_sgml2html" = "no"; then
+	DOCMODULE=""
+else
+	DOCMODULE="doc"
+fi
 dnl 
-dnl ----- Build root
-AC_SUBST(build_root)
-AC_ARG_WITH(build-root, [  --with-buildroot        RPM Build root],[build_root=$withval],[build_root=""])
-dnl
-dnl ----- YC: The Yaz Compiler
+dnl ----- yaz-comp: The Yaz Compiler
 AC_SUBST(ASNMODULE)
 AC_SUBST(ILLMODULE)
 AC_SUBST(ILLLIB)
-AC_ARG_ENABLE(yc,[  --enable-yc             compile using YAZ' ASN.1 Compiler], , enable_yc=yes)
-if test "$enable_yc" = "yes"; then
+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=libill.a
+	ILLLIB=../ill/libill.a
+	ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
 	cp -f include/yaz/z-proto.h include/yaz/proto.h
 else
 	ILLMODULE=""
 	ASNMODULE=asn
 	ILLLIB=""
+	ASN_MAKEFILES="asn/Makefile"
 	cp -f include/yaz/prt-proto.h include/yaz/proto.h
 fi
 dnl
@@ -46,6 +53,9 @@ AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 dnl
 dnl ------ GNU Readline
 AC_CHECK_LIB(readline, readline, [LIBS="$LIBS -lreadline"])
+if test "$ac_cv_lib_readline_readline" = "no"; then
+	AC_CHECK_LIB(readline, readline, [LIBS="$LIBS -lreadline -ltermcap"])
+fi
 AC_CHECK_LIB(history, add_history, [LIBS="$LIBS -lhistory"])
 if test "$ac_cv_lib_readline_readline" = "yes"; then
 	AC_CHECK_HEADERS(readline/readline.h readline/history.h)
@@ -89,5 +99,9 @@ if test "$enable_threads" = "yes"; then
 	AC_DEFINE(_REENTRANT)
 fi
 dnl
+SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest $DOCMODULE"
+AC_SUBST(SUBDIRS_VAR)
+dnl
 dnl ------ Makefiles
-AC_OUTPUT(Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile zutil/Makefile comstack/Makefile client/Makefile server/Makefile ztest/Makefile retrieval/Makefile ccl/Makefile lib/Makefile rfc1006/Makefile ill/Makefile)
+dnl
+AC_OUTPUT(Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile ill/Makefile zutil/Makefile comstack/Makefile ccl/Makefile tab/Makefile retrieval/Makefile server/Makefile include/Makefile include/yaz/Makefile lib/Makefile client/Makefile ztest/Makefile doc/Makefile)