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.29],[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])
dnl ------ OpenSSL
AC_SUBST([SSL_CFLAGS])
AC_SUBST([SSL_LIBS])
-openssl=default
+openssl=no
sslver=no
AC_ARG_WITH([openssl], [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
SSL_CFLAGS=""
fi
fi
dnl ------ GNU TLS
-gnutls=no
-AC_ARG_WITH([gnutls], [ --with-gnutls[=PREFIX] GNU TLS library in PREFIX], [gnutls=$withval])
+gnutls=default
+AC_ARG_WITH([gnutls], [ --with-gnutls[=PREFIX] GNU TLS library in PREFIX], [gnutls=$withval])
if test "$gnutls" != "no" -a "$sslver" = "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` -lgnutls-openssl"
+ SSL_LIBS="`$gnutls/bin/pkg-config --libs gnutls`"
gnutlsver=`$gnutls/bin/pkg-config --modversion gnutls`
fi
fi
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
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
+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);}'`
+AC_SUBST([WIN_FILEVERSION])
+YAZ_VERSION_HEX=`echo $PACKAGE_VERSION | awk 'BEGIN { FS = "."; } { printf("%x", ($1 * 256 + $2) * 256 + $3);}'`
+AC_SUBST([YAZ_VERSION_HEX])
dnl
dnl ------ Makefiles
dnl
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
]