Improved installation. Moved header files to include/yaz.

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

diff --git a/configure.in b/configure.in
index bde016a..57511fe 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,24 +1,28 @@
 dnl YAZ Toolkit
 dnl (c) Index Data 1994-1999
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.10 1999-06-08 13:11:55 adam Exp $
-AC_INIT(include/yaz-version.h)
+dnl $Id: configure.in,v 1.12 1999-11-30 13:47:10 adam Exp $
+AC_INIT(include/yaz/yaz-version.h)
 dnl
 dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
+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
 AC_SUBST(ASNMODULE)
-AC_ARG_WITH(yc,[  --with-yc               compile using YC: The Yaz Compiler], [YCDIR=$withval],[YCDIR=""])
-if test "$YCDIR" = "yes"; then
+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
+       cp -f include/yaz/z-proto.h include/yaz/proto.h
 else
        ASNMODULE=asn
-       cp -f include/prt-proto.h include/proto.h
+       cp -f include/yaz/prt-proto.h include/yaz/proto.h
 fi
 dnl
 dnl ----- Sockets
@@ -42,21 +46,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 -lnsl"
+       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
@@ -66,9 +73,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