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.28],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[3.0.41],[yaz-help@indexdata.dk])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([1.9])
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])
+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],[],[],[])
AC_CHECK_HEADERS([net/if.h netinet/in.h netinet/if_ether.h],[],[],[
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
fi
AC_CHECK_FUNC([gethostbyname], ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
dnl
+
dnl ------ OpenSSL
AC_SUBST([SSL_CFLAGS])
-openssl=default
+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
- 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`
- LIBS="$LIBS `$openssl/bin/pkg-config --libs openssl`"
+ SSL_LIBS="`$openssl/bin/pkg-config --libs openssl`"
sslver=`$openssl/bin/pkg-config --modversion openssl`
fi
fi
if test "$pkgconfigpath" != "NONE"; then
if $pkgconfigpath --exists openssl; then
SSL_CFLAGS=`$pkgconfigpath --cflags openssl`
- LIBS="$LIBS `$pkgconfigpath --libs openssl`"
+ SSL_LIBS="`$pkgconfigpath --libs openssl`"
sslver=`$pkgconfigpath --modversion openssl`
fi
fi
if test "$sslver" = "no"; then
xLIBS="$LIBS";
xCPPFLAGS="$CPPFLAGS";
- CPPFLAGS="$CPPFLAGS $SSL_CFLAGS $SSL_LIBPATH"
+ 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])
- LIBS="$SSL_LIBPATH $LIBS"
+ SSL_LIBS="${SSL_LIBS} -lssl"
fi
if test "$sslver" != "yes"; then
- LIBS="$xLIBS"
+ SSL_LIBS=""
fi
+ LIBS="$xLIBS"
CPPFLAGS="$xCPPFLAGS"
fi
AC_MSG_CHECKING([for SSL])
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
+ 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
+ else
+ if test "$pkgconfigpath" != "NONE"; then
+ if $pkgconfigpath --exists gnutls; then
+ SSL_CFLAGS=`$pkgconfigpath --cflags gnutls`
+ SSL_LIBS="`$pkgconfigpath --libs gnutls`"
+ gnutlsver=`$pkgconfigpath --modversion gnutls`
+ fi
+ fi
+ fi
+ AC_MSG_CHECKING([for GNU TLS])
+ if test "$gnutlsver" != "no"; then
+ SSL_CFLAGS="-DHAVE_GNUTLS_H=1 $SSL_CFLAGS"
+ AC_MSG_RESULT([$gnutlsver])
+ else
+ SSL_CFLAGS=""
+ AC_MSG_RESULT([None])
+ if test "$gnutls" != "default"; then
+ AC_MSG_ERROR([GNU TLS development libraries missing])
+ fi
+ fi
+fi
dnl
dnl ------ GNU Readline
READLINE_SHARED_LIBADD=""
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)
+ 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"
+ ])
+
+fi
YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS $XML2_CFLAGS"
if test "$XML2_LIBS"; then
dnl
dnl
-AC_CHECK_ICU([3.6],[
+AC_CHECK_ICU([3.4],[
if test "$xml_enabled" = "true"; then
ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"
else
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])
+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
+AC_SUBST([VERSION_SHA1])
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
]
projects / yaz-moved-to-github.git / blobdiff