X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=b30c472b21e54ddad3d5ba1338cdbab489c7d359;hp=ce9e76055b1460a6688660053db951546e6a2c36;hb=a3a04fe5dc71bfa1f55765ea6557ce312b2c57cf;hpb=88d3bedf772316f87e1996f655ccf8d1e2589755 diff --git a/configure.ac b/configure.ac index ce9e760..b30c472 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,14 @@ dnl This file is part of the YAZ toolkit. -dnl Copyright (C) 1995-2010 Index Data +dnl Copyright (C) Index Data +dnl See the file LICENSE for details. AC_PREREQ([2.60]) -AC_INIT([yaz],[4.0.0],[yaz-help@indexdata.dk]) +AC_INIT([yaz], +m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']), +[yaz-help@indexdata.dk]) +AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([config]) -AM_INIT_AUTOMAKE([1.9]) +AM_INIT_AUTOMAKE([1.11.1 subdir-objects]) dnl AC_SUBST([READLINE_LIBS]) AC_SUBST([YAZ_CONF_CFLAGS]) @@ -19,9 +23,9 @@ AM_PROG_LIBTOOL AC_PATH_PROG([pkgconfigpath],[pkg-config],[NONE]) dnl YAZ_DOC -dnl dnl -AC_CHECK_HEADERS([dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h unistd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/times.h sys/types.h sys/un.h sys/wait.h netdb.h arpa/inet.h netinet/tcp.h netinet/in_systm.h],[],[],[]) +dnl +AC_CHECK_HEADERS([dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h unistd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/times.h sys/types.h sys/un.h sys/wait.h sys/prctl.h netdb.h arpa/inet.h netinet/tcp.h netinet/in_systm.h],[],[],[]) AC_CHECK_HEADERS([net/if.h netinet/in.h netinet/if_ether.h],[],[],[ #if HAVE_SYS_TYPES_H #include @@ -56,76 +60,12 @@ if test "$checkBoth" = "1"; then fi AC_CHECK_FUNC([gethostbyname], ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])]) dnl - -dnl ------ OpenSSL +dnl ------ GNU TLS AC_SUBST([SSL_CFLAGS]) AC_SUBST([SSL_LIBS]) -openssl=no -sslver=no -AC_ARG_WITH([openssl], [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval]) -SSL_CFLAGS="" -SSL_LIBPATH="" -if test "$openssl" != "no"; then - if test "$openssl" != "yes" -a "$openssl" != "default"; then - if test -x $openssl/bin/pkg-config; then - if $openssl/bin/pkg-config --exists openssl; then - SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl` - SSL_LIBS="`$openssl/bin/pkg-config --libs openssl`" - sslver=`$openssl/bin/pkg-config --modversion openssl` - fi - fi - if test "$sslver" = "no"; then - SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl" - SSL_LIBPATH="-L$openssl/lib" - fi - else - if test "$pkgconfigpath" != "NONE"; then - if $pkgconfigpath --exists openssl; then - SSL_CFLAGS=`$pkgconfigpath --cflags openssl` - SSL_LIBS="`$pkgconfigpath --libs openssl`" - sslver=`$pkgconfigpath --modversion openssl` - fi - fi - if test "$sslver" = "no"; then - SSL_CFLAGS="-I/usr/include/openssl" - fi - fi - if test "$sslver" = "no"; then - xLIBS="$LIBS"; - xCPPFLAGS="$CPPFLAGS"; - CPPFLAGS="$CPPFLAGS ${SSL_CFLAGS} ${SSL_LIBPATH}" - SSL_LIBS="${SSL_LIBPATH}" - AC_CHECK_LIB([crypto],[main]) - if test "$ac_cv_lib_crypto_main" = "yes"; then - SSL_LIBS="${SSL_LIBS} -lcrypto" - fi - AC_CHECK_LIB([ssl],[SSL_new]) - if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then - AC_CHECK_HEADER([openssl/ssl.h],[sslver=yes]) - SSL_LIBS="${SSL_LIBS} -lssl" - fi - if test "$sslver" != "yes"; then - SSL_LIBS="" - fi - LIBS="$xLIBS" - CPPFLAGS="$xCPPFLAGS" - fi - AC_MSG_CHECKING([for SSL]) - if test "$sslver" != "no"; then - SSL_CFLAGS="-DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS" - AC_MSG_RESULT([$sslver]) - else - SSL_CFLAGS="" - AC_MSG_RESULT([None]) - if test "$openssl" != "default"; then - AC_MSG_ERROR([OpenSSL development libraries missing]) - fi - fi -fi -dnl ------ GNU TLS gnutls=default AC_ARG_WITH([gnutls], [ --with-gnutls[=PREFIX] GNU TLS library in PREFIX], [gnutls=$withval]) -if test "$gnutls" != "no" -a "$sslver" = "no"; then +if test "$gnutls" != "no"; then gnutlsver=no if test "$gnutls" != "yes" -a "$gnutls" != "default"; then if test -x $gnutls/bin/pkg-config; then @@ -146,7 +86,7 @@ if test "$gnutls" != "no" -a "$sslver" = "no"; then fi AC_MSG_CHECKING([for GNU TLS]) if test "$gnutlsver" != "no"; then - SSL_CFLAGS="-DHAVE_GNUTLS_H=1 $SSL_CFLAGS" + AC_DEFINE([HAVE_GNUTLS_H],[1],[Define to 1 if GNUTLS is present]) AC_MSG_RESULT([$gnutlsver]) else SSL_CFLAGS="" @@ -174,13 +114,13 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then #include ],[ rl_attempted_completion_over = 0; - ],AC_DEFINE([HAVE_READLINE_COMPLETION_OVER])) + ],AC_DEFINE([HAVE_READLINE_COMPLETION_OVER],1,[Define to 1 if rl_attempted_completion_over is defined])) AC_TRY_LINK([ #include #include ],[ rl_completion_matches (0, 0); - ],[AC_DEFINE([HAVE_READLINE_RL_COMPLETION_MATCHES])]) + ],[AC_DEFINE([HAVE_READLINE_RL_COMPLETION_MATCHES],1,[Define to 1 if rl_completion_matches is defined])]) LIBS=$xLIBS fi dnl ------ iconv @@ -198,7 +138,7 @@ if test "$with_iconv" != "no"; then ],[ iconv_t t = iconv_open("", ""); ],[ - AC_DEFINE([HAVE_ICONV_H]) + AC_DEFINE([HAVE_ICONV_H],1,[Define to 1 if iconv.h is present]) AC_MSG_RESULT([yes]) ],[ LIBS="$LIBS -liconv" @@ -207,7 +147,7 @@ if test "$with_iconv" != "no"; then ],[ iconv_t t = iconv_open("", ""); ],[ - AC_DEFINE([HAVE_ICONV_H]) + AC_DEFINE([HAVE_ICONV_H],1) AC_MSG_RESULT([yes]) ],[ LIBS="$oldLIBS" @@ -278,8 +218,7 @@ extern int accept(int, struct sockaddr *, size_t t *); ]) ]) AC_MSG_RESULT([$ac_cv_check_socklen_t]) -AC_DEFINE_UNQUOTED([YAZ_SOCKLEN_T],[$ac_cv_check_socklen_t]) -AC_DEFINE([YAZ_USE_NEW_LOG]) +AC_DEFINE_UNQUOTED([YAZ_SOCKLEN_T],[$ac_cv_check_socklen_t],[socklen_t type]) dnl dnl ------ tcpd AC_ARG_ENABLE([tcpd],[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available]) @@ -299,16 +238,18 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then [struct request_info request_info; int i; i = hosts_access(&request_info);], tcpd_ok=1, tcpd_ok=0) + LIBS=$oldLibs if test "$tcpd_ok" = "0"; then AC_MSG_RESULT([no]) AC_MSG_ERROR([tcpd development libraries missing]) - LIBS=$oldLibs - CPPFLAGS=$oldCPPFLAGS + CPPFLAGS=$oldCPPFLAGS else + TCPD_LIBS="-lwrap" AC_MSG_RESULT([yes]) - AC_DEFINE([HAVE_TCPD_H]) + AC_DEFINE([HAVE_TCPD_H],1,[Define to 1 if tcp wrap library is present]) fi fi +AC_SUBST([TCPD_LIBS]) dnl AC_SUBST([YAZ_CONFIG_CFLAGS]) dnl @@ -319,8 +260,8 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then ACX_PTHREAD([ OCFLAGS=$CFLAGS CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - dnl unfortunately empty thread lib spec is problematic because - dnl 'yaz-config --cflags' is not always passed to linker in + dnl unfortunately empty thread lib spec is problematic because + dnl 'yaz-config --cflags' is not always passed to linker in dnl applications using YAZ (such as Zebra). if test "x$PTHREAD_LIBS" = "x"; then OLIBS=$LIBS @@ -333,8 +274,9 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then done LIBS=$OLIBS fi - CFLAGS=$OCFLAGS - PTHREAD_CFLAGS="$PTHREAD_CFLAGS -DYAZ_POSIX_THREADS=1" + LIBS="$LIBS $PTHREAD_LIBS" + AC_DEFINE(YAZ_POSIX_THREADS,1,[Define to 1 if POSIX threads is present]) + YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_POSIX_THREADS=1" ]) fi @@ -343,21 +285,21 @@ AC_SUBST([XML2_CFLAGS]) xml_enabled=false YAZ_LIBXML2([ - AC_DEFINE(YAZ_HAVE_XML2) + AC_DEFINE(YAZ_HAVE_XML2,1,[Define to 1 if Libxml2 is present]) YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XML2=1" xml_enabled=true ]) if test "$xml_enabled" = "true"; then YAZ_LIBXSLT([ - AC_DEFINE(YAZ_HAVE_XSLT) + AC_DEFINE(YAZ_HAVE_XSLT,1,[Define to 1 if Libxslt is present]) YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XSLT=1" ]) YAZ_LIBEXSLT([ - AC_DEFINE(YAZ_HAVE_EXSLT) + AC_DEFINE(YAZ_HAVE_EXSLT,1,[Define to 1 if EXSLT is present]) YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1" ]) - + fi YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS $XML2_CFLAGS" @@ -366,7 +308,7 @@ if test "$XML2_LIBS"; then fi dnl -dnl +dnl AC_CHECK_ICU([3.4],[ if test "$xml_enabled" = "true"; then ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1" @@ -375,21 +317,6 @@ AC_CHECK_ICU([3.4],[ AC_MSG_WARN([ICU support disabled because XML support is unavailable]) fi ]) -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]) -YAZ_SRC_ROOT=`cd ${srcdir}; pwd` -YAZ_BUILD_ROOT=`pwd` -dnl dnl ------ versioning dnl WIN_FILEVERSION=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'` @@ -407,7 +334,6 @@ dnl ------ Makefiles dnl AC_OUTPUT([ Makefile -yaz.spec src/Makefile test/Makefile util/Makefile @@ -417,7 +343,7 @@ client/Makefile ztest/Makefile zoom/Makefile doc/Makefile -doc/local.ent +doc/local0.ent doc/common/Makefile doc/common/print.dsl etc/Makefile @@ -427,7 +353,9 @@ Doxyfile win/version.nsi include/yaz/yaz-version.h ],[ - sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config + sed s%echo_source=yes%echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config + diff doc/local.ent doc/local0.ent >/dev/null 2>/dev/null \ + || cp doc/local0.ent doc/local.ent ] )