X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=c28283631c9366d90db44a358bf0b333b0beed0e;hp=36e9ca62fce4ab454c9e14a1a474bdc3b08fa873;hb=9397bf54a2ddb4e0fe8a73d5f753eee23a10601c;hpb=76d7a32ad18dfab123315e59b2b941d7cdf3632a diff --git a/configure.ac b/configure.ac index 36e9ca6..c282836 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl This file is part of the YAZ toolkit. dnl Copyright (C) 1995-2008 Index Data AC_PREREQ([2.60]) -AC_INIT([yaz],[3.0.30],[yaz-help@indexdata.dk]) +AC_INIT([yaz],[3.0.38],[yaz-help@indexdata.dk]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE([1.9]) @@ -131,7 +131,7 @@ if test "$gnutls" != "no" -a "$sslver" = "no"; 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` -lgnutls-openssl" + SSL_LIBS="`$gnutls/bin/pkg-config --libs gnutls`" gnutlsver=`$gnutls/bin/pkg-config --modversion gnutls` fi fi @@ -139,7 +139,7 @@ if test "$gnutls" != "no" -a "$sslver" = "no"; then if test "$pkgconfigpath" != "NONE"; then if $pkgconfigpath --exists gnutls; then SSL_CFLAGS=`$pkgconfigpath --cflags gnutls` - SSL_LIBS="`$pkgconfigpath --libs gnutls` -lgnutls-openssl" + SSL_LIBS="`$pkgconfigpath --libs gnutls`" gnutlsver=`$pkgconfigpath --modversion gnutls` fi fi @@ -390,6 +390,7 @@ YAZ_BUILD_ROOT=`pwd` dnl ------ windows version files WIN_FILEVERSION=`echo $PACKAGE_VERSION|tr . ,`.1 +AC_SUBST([WIN_FILEVERSION]) dnl dnl ------ Makefiles dnl @@ -412,6 +413,7 @@ etc/Makefile yaz-config yaz.pc Doxyfile +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 ]