Generate yaz-version.h from configure.ac (except YAZ_VERSIONL)

[yaz-moved-to-github.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 36e9ca6..c282836 100644 (file)
--- 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
     ]