X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=b30c472b21e54ddad3d5ba1338cdbab489c7d359;hp=6d2b5b7a20f778e9ae698c5eee525ef008650e98;hb=a3a04fe5dc71bfa1f55765ea6557ce312b2c57cf;hpb=1f41a1d415d2ab138050a96020ed39caa0c4e323 diff --git a/configure.ac b/configure.ac index 6d2b5b7..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-2008 Index Data +dnl Copyright (C) Index Data +dnl See the file LICENSE for details. AC_PREREQ([2.60]) -AC_INIT([yaz],[3.0.29],[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,68 +60,39 @@ 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=default -AC_ARG_WITH([openssl], [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval]) -SSL_CFLAGS="" -SSL_LIBPATH="" -if test "$openssl" != "no"; then - sslver=no - 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` +gnutls=default +AC_ARG_WITH([gnutls], [ --with-gnutls[=PREFIX] GNU TLS library in PREFIX], [gnutls=$withval]) +if test "$gnutls" != "no"; then + gnutlsver=no + if test "$gnutls" != "yes" -a "$gnutls" != "default"; then + if test -x $gnutls/bin/pkg-config; then + if $gnutls/bin/pkg-config --exists gnutls; then + SSL_CFLAGS=`$gnutls/bin/pkg-config --cflags gnutls` + SSL_LIBS="`$gnutls/bin/pkg-config --libs gnutls`" + gnutlsver=`$gnutls/bin/pkg-config --modversion gnutls` 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` + if $pkgconfigpath --exists gnutls; then + SSL_CFLAGS=`$pkgconfigpath --cflags gnutls` + SSL_LIBS="`$pkgconfigpath --libs gnutls`" + gnutlsver=`$pkgconfigpath --modversion gnutls` 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]) + AC_MSG_CHECKING([for GNU TLS]) + if test "$gnutlsver" != "no"; then + AC_DEFINE([HAVE_GNUTLS_H],[1],[Define to 1 if GNUTLS is present]) + AC_MSG_RESULT([$gnutlsver]) else SSL_CFLAGS="" AC_MSG_RESULT([None]) - if test "$openssl" != "default"; then - AC_MSG_ERROR([OpenSSL development libraries missing]) + if test "$gnutls" != "default"; then + AC_MSG_ERROR([GNU TLS development libraries missing]) fi fi fi @@ -139,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 @@ -163,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" @@ -172,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" @@ -243,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]) @@ -264,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 @@ -284,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 @@ -298,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 @@ -308,20 +285,22 @@ 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 ]) -YAZ_LIBXSLT([ - AC_DEFINE(YAZ_HAVE_XSLT) - YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XSLT=1" - ]) -YAZ_LIBEXSLT([ - AC_DEFINE(YAZ_HAVE_EXSLT) - YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1" - ]) - +if test "$xml_enabled" = "true"; then + YAZ_LIBXSLT([ + 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,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" if test "$XML2_LIBS"; then @@ -329,8 +308,8 @@ if test "$XML2_LIBS"; then fi dnl -dnl -AC_CHECK_ICU([3.6],[ +dnl +AC_CHECK_ICU([3.4],[ if test "$xml_enabled" = "true"; then ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1" else @@ -338,29 +317,23 @@ AC_CHECK_ICU([3.6],[ AC_MSG_WARN([ICU support disabled because XML support is unavailable]) fi ]) +dnl ------ versioning 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]) +WIN_FILEVERSION=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'` +AC_SUBST([WIN_FILEVERSION]) +VERSION_HEX=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { printf("%x", ($1 * 256 + $2) * 256 + $3);}'` +AC_SUBST([VERSION_HEX]) +if test -d ${srcdir}/.git; then + VERSION_SHA1=`git show --pretty=format:%H|head -1` +else + VERSION_SHA1=`head -1 ${srcdir}/ChangeLog|awk '{print $2}'` 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 ------ windows version files -WIN_FILEVERSION=`echo $PACKAGE_VERSION|tr . ,`.1 +AC_SUBST([VERSION_SHA1]) dnl dnl ------ Makefiles dnl AC_OUTPUT([ Makefile -yaz.spec src/Makefile test/Makefile util/Makefile @@ -370,15 +343,19 @@ client/Makefile ztest/Makefile zoom/Makefile doc/Makefile -doc/local.ent +doc/local0.ent doc/common/Makefile doc/common/print.dsl etc/Makefile yaz-config yaz.pc 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 ] )