dnl YAZ Toolkit, Index Data 1994-2001
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.43 2001-04-05 13:08:48 adam Exp $
+dnl $Id: configure.in,v 1.64 2002-03-18 12:22:00 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.7)
+AM_INIT_AUTOMAKE(yaz, 1.8.6)
dnl
AC_SUBST(READLINE_LIBS)
dnl ------ Checking programs
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
+
+EXTRAMODULE="z39.50 zutil"
+
+AC_ARG_ENABLE(modules,[ --enable-modules=\"mod ..\" ill],[
+if test "$enable_modules" != "no"; then
+ EXTRAMODULE="$EXTRAMODULE $enable_modules"
fi
-AC_ARG_ENABLE(module,[ --enable-module=\"mod ..\" ill],[
- EXTRAMODULE="$EXTRAMODULE $enable_module"])
+],[
+EXTRAMODULE="$EXTRAMODULE ill ccl zoom"
+])
EXTRALIB=""
for module in $EXTRAMODULE; do
EXTRALIB="$EXTRALIB ../$module/lib${module}.la"
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)
-else
- AC_MSG_RESULT(yes)
- cp -f $HFILE ${yaz_include}/proto.h
- if test "$enable_comp" != "yes"; then
- cp ${srcdir}/asn/*.h ${yaz_include}
- fi
-fi
-dnl
dnl ----- Sockets
checkBoth=0
AC_CHECK_FUNC(connect)
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_SUBST(SSL_CFLAGS)
+AC_SUBST(SSL_LIBS)
+AC_SUBST(SSL_DEFS)
+USE_SSL=0
+SSL_CFLAGS=""
+SSL_LIBS=""
+SSL_DEFS=""
+if test "$openssl" != "no"; then
+ xLIBS="$LIBS";
+ xCFLAGS="$CFLAGS";
+ if test "$openssl" != "yes"; then
+ SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
+ SSL_LIBS="-L$openssl/lib"
+ CFLAGS="$SSL_CFLAGS $CFLAGS"
+ LIBS="$SSL_LIBS $LIBS"
+ fi
+ AC_CHECK_LIB(crypto, main,[SSL_LIBS="$SSL_LIBS -lcrypto"])
+ LIBS="$LIBS $SSL_LIBS"
AC_CHECK_LIB(ssl, SSL_new)
if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
- AC_CHECK_HEADERS(openssl/ssl.h)
+ SSL_LIBS="$SSL_LIBS -lssl"
+ AC_CHECK_HEADER(openssl/ssl.h,[SSL_DEFS="-DHAVE_OPENSSL_SSL_H=1"; USE_SSL=1])
+ else
+ SSL_LIBS=""
fi
+ LIBS="$xLIBS"
+ CFLAGS="$xCFLAGS"
fi
+AM_CONDITIONAL(ISSSL, test $USE_SSL = "1")
dnl ------ GNU Readline
READLINE_SHARED_LIBADD=""
AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
if test "$ac_cv_lib_readline_readline" = "yes"; then
AC_CHECK_HEADERS(readline/readline.h readline/history.h)
fi
-dnl ------ snprintf
-AC_CHECK_FUNCS(vsnprintf gettimeofday)
+dnl ------ various functions
+AC_CHECK_FUNCS(vsnprintf gettimeofday poll)
+if test "$ac_cv_func_poll" = "yes"; then
+ AC_CHECK_HEADERS(sys/poll.h)
+fi
dnl
dnl ------ tcpd
AC_ARG_ENABLE(tcpd,[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available])
fi
dnl
dnl ------ Headers
+AC_CHECK_HEADERS(fnmatch.h)
AC_STDC_HEADERS
if test "$ac_cv_header_stdc" = "no"; then
AC_MSG_WARN(Your system doesn't seem to support ANSI C)
fi
dnl
-dnl ------ Threads
-AC_ARG_ENABLE(threads, [ --disable-threads disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
AC_SUBST(LIBTHREAD)
-if test "$enable_threads" = "yes"; then
+AC_SUBST(CFLAGSTHREADS)
+HAVETHREADS=0
+CFLAGSTHREADS=""
+LIBTHREAD=""
+dnl
+dnl ------ GNU threads
+AC_ARG_ENABLE(pth, [ --enable-pth enable GNU threads],[enable_pth=$enableval],[enable_pth=no])
+AC_SUBST(LIBPTH)
+if test "$enable_pth" = "yes"; then
+ OLIBS=$LIBS
+ AC_CHECK_LIB(pth,main)
+ if test "$ac_cv_lib_pth_main" = "yes"; then
+ AC_CHECK_HEADERS(pth.h)
+ if test "$ac_cv_header_pth_h" = "yes"; then
+ LIBTHREAD="-lpth"
+ CFLAGSTHREADS="-DYAZ_GNU_THREADS=1"
+ HAVETHREADS=1
+ fi
+ fi
+ LIBS=$OLIBS
+fi
+dnl
+dnl ------ POSIX Threads
+AC_ARG_ENABLE(threads, [ --disable-threads disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
+if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
OLIBS=$LIBS
+ OCC=$CC
AC_CHECK_LIB(pthread,main)
AC_MSG_CHECKING(for working POSIX Threads)
AC_TRY_LINK([#include <pthread.h>
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)
+ LIBTHREAD=-lpthread
+ CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
HAVETHREADS=1
else
- LIBTHREAD=""
+ CC="$CC -pthread"
+ AC_TRY_LINK([#include <pthread.h>
+ void *func(void *p) { return 0; }
+ ],[
+ pthread_t pthread_id;
+ pthread_create (&pthread_id, 0, func, 0);],
+ thread_ok=yes,thread_ok=no)
+ if test "$thread_ok" = "yes"; then
+ AC_MSG_RESULT([yes,BSD])
+ CFLAGSTHREADS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+ HAVETHREADS=1
+ fi
+ fi
+ if test "$thread_ok" = "no"; then
AC_MSG_RESULT(no)
- HAVETHREADS=0
fi
+ CC=$OCC
LIBS=$OLIBS
fi
AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
+dnl
+dnl ------ Memory debugging
+AC_ARG_ENABLE(memdebug, [ --enable-memdebug enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])
+if test "$enable_memdebug" = "yes"; then
+ AC_DEFINE(TRACE_XMALLOC,2)
+elif test "$enable_memdebug" = "no"; then
+ AC_DEFINE(TRACE_XMALLOC,0)
+fi
+dnl
dnl ------ Using this for "in-source" yaz-config
AC_SUBST(YAZ_SRC_ROOT)
AC_SUBST(YAZ_BUILD_ROOT)
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 $EXTRAMODULE zutil comstack ccl tab retrieval server include lib client ztest"
+SUBDIRS_VAR="util odr comstack $EXTRAMODULE tab retrieval server include lib include client ztest"
AC_SUBST(SUBDIRS_VAR)
dnl ------ Makefiles
dnl
AC_OUTPUT([
Makefile
+yaz.spec
util/Makefile
odr/Makefile
z39.50/Makefile
-asn/Makefile
ill/Makefile
zutil/Makefile
comstack/Makefile
include/Makefile
include/yaz/Makefile
lib/Makefile
+zoom/Makefile
client/Makefile
ztest/Makefile
doc/Makefile
+doc/yaz.xml
yaz-config
lib/yaz-config
],[chmod +x yaz-config lib/yaz-config])
projects / yaz-moved-to-github.git / blobdiff