Cleaning up. Seems to work all right

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

diff --git a/configure.in b/configure.in
index f1cfa19..3551f37 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl YAZ Toolkit
 dnl (c) Index Data 1994-1999
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.9 1999-06-08 10:10:16 adam Exp $
+dnl $Id: configure.in,v 1.11 1999-06-09 14:23:58 adam Exp $
 AC_INIT(include/yaz-version.h)
 dnl
 dnl ------ Checking programs
@@ -12,12 +12,13 @@ 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
+AC_ARG_ENABLE(yc,[  --enable-yc             compile using YAZ' ASN.1 Compiler (YC)])
+if test "$enable_yc" = "yes"; then
+       ASNMODULE="z39.50"
+       cp -f include/z-proto.h include/proto.h
 else
        ASNMODULE=asn
+       cp -f include/prt-proto.h include/proto.h
 fi
 dnl
 dnl ----- Sockets
@@ -41,21 +42,24 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
 fi
 dnl
 dnl ------ tcpd
-AC_MSG_CHECKING(for working tcpd.h)
-oldLibs=$LIBS
-LIBS="$LIBS -lwrap"
-AC_TRY_LINK([#include <syslog.h>
-#include <tcpd.h>
-int allow_severity = LOG_INFO;
-int deny_severity = LOG_WARNING;],
-[struct request_info request_info; int i;
-i = hosts_access(&request_info);],tcpd_ok=1, tcpd_ok=0)
-if test "$tcpd_ok" = "0"; then
-       AC_MSG_RESULT(no)
-       LIBS=$oldLibs
-else
-       AC_MSG_RESULT(yes)
-       AC_DEFINE(HAVE_TCPD_H)
+AC_ARG_ENABLE(tcpd,[  --enable-tcpd           enable TCP wrapper for server if available])
+if test "$enable_tcpd" = "yes"; then
+       AC_MSG_CHECKING(for working tcpd.h)
+       oldLibs=$LIBS
+       LIBS="$LIBS -lwrap"
+       AC_TRY_LINK([#include <syslog.h>
+       #include <tcpd.h>
+       int allow_severity = LOG_INFO;
+       int deny_severity = LOG_WARNING;],
+       [struct request_info request_info; int i;
+       i = hosts_access(&request_info);],tcpd_ok=1, tcpd_ok=0)
+       if test "$tcpd_ok" = "0"; then
+               AC_MSG_RESULT(no)
+               LIBS=$oldLibs
+       else
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_TCPD_H)
+       fi
 fi
 dnl
 dnl ------ Headers
@@ -65,9 +69,8 @@ if test "$ac_cv_header_stdc" = "no"; then
 fi
 dnl
 dnl ------ Threads
-AC_ARG_ENABLE(threads, [  --enable-threads        enable threads if available],
-    [threads_ok=$enableval], [threads_ok=no])
-if test "$threads_ok" = "yes"; then
+AC_ARG_ENABLE(threads, [  --enable-threads        enable threads if available])
+if test "$enable_threads" = "yes"; then
        AC_CHECK_HEADERS(pthread.h threads.h)
        AC_CHECK_FUNC(pthread_mutex_lock)
        if test "$ac_cv_func_pthread_mutex_lock" = "no"; then
@@ -77,4 +80,4 @@ if test "$threads_ok" = "yes"; then
 fi
 dnl
 dnl ------ Makefiles
-AC_OUTPUT(Makefile util/Makefile asn/Makefile odr/Makefile zutil/Makefile comstack/Makefile client/Makefile server/Makefile ztest/Makefile retrieval/Makefile ccl/Makefile lib/Makefile rfc1006/Makefile z39.50/Makefile)
+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)