-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.33 2000-10-02 12:31:43 adam Exp $
+dnl $Id: configure.in,v 1.42 2001-03-21 12:43:36 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
AM_INIT_AUTOMAKE(yaz, 1.7)
dnl
ILLMODULE="ill"
ILLLIB=../ill/libill.la
ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
- HFILE=z-proto.h
+ HFILE=${srcdir}/include/yaz/z-proto.h
else
ILLMODULE=""
ASNMODULE=asn
ILLLIB=""
ASN_MAKEFILES="asn/Makefile"
- HFILE=prt-proto.h
+ HFILE=${srcdir}/asn/prt-proto.h
fi
AC_MSG_CHECKING(whether proto.h needs to be generated)
yaz_include=${srcdir}/include/yaz
-if test -r ${yaz_include}/proto.h && cmp -s ${yaz_include}/$HFILE ${yaz_include}/proto.h; then
+if test -r ${yaz_include}/proto.h && cmp -s $HFILE ${yaz_include}/proto.h; then
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
- cp -f ${yaz_include}/$HFILE ${yaz_include}/proto.h
+ cp -f $HFILE ${yaz_include}/proto.h
+ if test "$enable_comp" != "yes"; then
+ cp ${srcdir}/asn/*.h ${yaz_include}
+ fi
fi
dnl
dnl ----- Sockets
fi
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
dnl
+dnl ------ Open SSL
+openssl=no
+AC_ARG_WITH(openssl, [ --with-openssl[=DIR] OpenSSL library in DIR], [openssl=$withval])
+if test "$openssl" = "yes"; then
+ AC_CHECK_LIB(crypto, main)
+ AC_CHECK_LIB(ssl, SSL_new)
+ if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
+ AC_CHECK_HEADERS(openssl/ssl.h)
+ fi
+fi
dnl ------ GNU Readline
+READLINE_SHARED_LIBADD=""
+AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
+ AC_CHECK_LIB(termcap, tgetent, [READLINE_SHARED_LIBADD="-ltermcap"])
+)
READLINE_LIBS=""
-AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline"])
-if test "$ac_cv_lib_readline_readline" = "no"; then
- AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline -ltermcap"])
-fi
+AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline $READLINE_SHARED_LIBADD"],,$READLINE_SHARED_LIBADD)
AC_CHECK_LIB(history, add_history, [READLINE_LIBS="$READLINE_LIBS -lhistory"])
if test "$ac_cv_lib_readline_readline" = "yes"; then
AC_CHECK_HEADERS(readline/readline.h readline/history.h)
fi
dnl
dnl ------ Threads
-AC_ARG_ENABLE(threads, [ --enable-threads enable POSIX threads],[enable_threads=$enableval],[enable_threads=no])
+AC_ARG_ENABLE(threads, [ --disable-threads disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
+AC_SUBST(LIBTHREAD)
if test "$enable_threads" = "yes"; then
+ OLIBS=$LIBS
AC_CHECK_LIB(pthread,main)
AC_MSG_CHECKING(for working POSIX Threads)
AC_TRY_LINK([#include <pthread.h>
- int func(void *p) { return 0; }
+ void *func(void *p) { return 0; }
],[
pthread_t pthread_id;
- int r = pthread_create (&pthread_id, 0, func, 0);],
+ pthread_create (&pthread_id, 0, func, 0);],
thread_ok=yes,thread_ok=no)
if test "$thread_ok" = "yes"; then
+ LIBTHREAD=-lpthread
AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_PTHREAD_H)
- AC_DEFINE(_REENTRANT)
+ HAVETHREADS=1
else
+ LIBTHREAD=""
AC_MSG_RESULT(no)
+ HAVETHREADS=0
fi
+ LIBS=$OLIBS
fi
+AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
dnl ------ Using this for "in-source" yaz-config
AC_SUBST(YAZ_SRC_ROOT)
-YAZ_SRC_ROOT=`pwd`
+AC_SUBST(YAZ_BUILD_ROOT)
+YAZ_SRC_ROOT=`cd ${srcdir}; pwd`
+YAZ_BUILD_ROOT=`pwd`
+dnl
+if test -f ${srcdir}/lib/yaz-config.in; then
+ rm ${srcdir}/lib/yaz-config.in
+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"
AC_SUBST(SUBDIRS_VAR)
-dnl
dnl ------ Makefiles
dnl
AC_OUTPUT([
ztest/Makefile
doc/Makefile
yaz-config
-lib/yaz-config],[chmod +x lib/yaz-config yaz-config])
+lib/yaz-config
+],[chmod +x yaz-config lib/yaz-config])