-dnl YAZ Toolkit, Index Data 1995-2007
+dnl This file is part of the YAZ toolkit.
+dnl Copyright (C) Index Data
dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.67 2007-03-07 08:54:13 adam Exp $
-AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.53],[yaz-help@indexdata.dk])
-AC_CONFIG_SRCDIR(configure.ac)
+AC_PREREQ([2.60])
+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.8])
+AM_INIT_AUTOMAKE([1.9 subdir-objects])
dnl
-AC_SUBST(READLINE_LIBS)
-AC_SUBST(YAZ_CONF_CFLAGS)
+AC_SUBST([READLINE_LIBS])
+AC_SUBST([YAZ_CONF_CFLAGS])
dnl ------ Checking programs
AC_PROG_CC
AC_PROG_CPP
-AC_CHECK_PROGS(YACC, 'bison -y')
-test -z "$YACC" && AC_MSG_WARN([GNU bison not found])
-AC_CHECK_PROGS(TCLSH, tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2, tclsh)
+AC_CHECK_PROGS([YACC], 'bison -y')
+test -z "$YACC" -a ! -f src/cql.c && AC_MSG_ERROR([GNU Bison not found])
+test -z "$YACC" && AC_MSG_WARN([GNU Bison not found])
+AC_CHECK_PROGS([TCLSH], [tclsh tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2], [tclsh])
AC_PROG_INSTALL
AM_PROG_LIBTOOL
-AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
+AM_PROG_CC_C_O
+AC_PATH_PROG([pkgconfigpath],[pkg-config],[NONE])
dnl
YAZ_DOC
-dnl
dnl
-dnl ------ Headers
-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 netinet/in.h netdb.h arpa/inet.h netinet/tcp.h netinet/in_systm.h])
-AC_CHECK_HEADERS([netinet/if_ether.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 execinfo.h],[],[],[])
+AC_CHECK_HEADERS([net/if.h netinet/in.h netinet/if_ether.h],[],[],[
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
+ #if HAVE_NET_IF_H
+ #include <net/if.h>
+ #endif
#if HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
dnl
dnl ----- Sockets
checkBoth=0
-AC_CHECK_FUNC(connect)
+AC_CHECK_FUNC([connect])
if test "$ac_cv_func_connect" = "no"; then
- AC_CHECK_LIB(socket, main, LIBS="$LIBS -lsocket", checkBoth=1)
+ AC_CHECK_LIB([socket],[main], LIBS="$LIBS -lsocket", checkBoth=1)
fi
if test "$checkBoth" = "1"; then
oldLibs=$LIBS
LIBS="$LIBS -lsocket -lnsl"
- AC_CHECK_FUNC(accept, , [LIBS=$oldLibs])
+ AC_CHECK_FUNC([accept], , [LIBS=$oldLibs])
fi
-AC_CHECK_FUNC(gethostbyname, ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
-dnl
-dnl ------ OpenSSL
-AC_SUBST(SSL_CFLAGS)
-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`
- LIBS="$LIBS `$openssl/bin/pkg-config --libs openssl`"
- sslver=`$openssl/bin/pkg-config --modversion openssl`
+AC_CHECK_FUNC([gethostbyname], ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
+dnl ------ libgcrypt
+AC_SUBST([GCRYPT_LIBS])
+libgcryptpath=NONE
+AC_ARG_WITH(libgcrypt, [ --with-libgcrypt=DIR use libgcrypt-config in DIR],[libgcryptpath=$withval])
+if test "$libgcryptpath" != "no"; then
+ if test "$libgcryptpath" = "NONE"; then
+ AC_PATH_PROG([libgcrypt],[libgcrypt-config],[NONE])
+ elif test -x $libgcryptpath/libgcrypt-config; then
+ libgcrypt=$libgcryptpath/libgcrypt-config
+ else
+ libgcrypt=$libgcryptpath
+ fi
+ AC_MSG_CHECKING([for libgcrypt])
+ if "$libgcrypt" --version >/dev/null 2>&1; then
+ libgcryptversion=`$libgcrypt --version`
+ libgcryptversion2=`echo "$libgcryptversion" | awk 'BEGIN { FS = "."; } { printf "%d", [$]1 * 1000 + [$]2;}'`
+ AC_MSG_RESULT([$libgcryptversion])
+ if test $libgcryptversion2 -ge 1002; then
+ GCRYPT_LIBS="`$libgcrypt --libs`"
+ CFLAGS="$CFLAGS `$libgcrypt --cflags`"
+ AC_DEFINE([HAVE_GCRYPT_H],[1],[Define to 1 if libgcrypt is present])
+ else
+ if test "$libgcryptpath" = "NONE"; then
+ AC_MSG_WARN([Only libgcrypt version 1.2 and later supported])
+ else
+ AC_MSG_ERROR([Only libgcrypt version 1.2 and later supported])
fi
+ libgcryptversion=""
fi
- if test "$sslver" = "no"; then
- SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
- SSL_LIBPATH="-L$openssl/lib"
+ else
+ AC_MSG_RESULT([no])
+ fi
+fi
+dnl ------ redis
+hiredis=default
+AC_SUBST([HIREDIS_LIBS])
+AC_ARG_WITH([redis], [ --with-redis hiredis library], [hiredis=$withval])
+if test "$hiredis" != "no" -a "$pkgconfigpath" != "NONE" -a "$libgcryptversion"; then
+ AC_CHECK_LIB([hiredis],[redisCommandArgv],[HIREDIS_LIBS=-lhiredis])
+ AC_MSG_CHECKING([for redis])
+ if $pkgconfigpath --cflags hiredis >/dev/null 2>&1 ; then
+ if $pkgconfigpath --atleast-version 0.10 hiredis; then
+ AC_MSG_RESULT([yes])
+ CFLAGS="$CFLAGS `$pkgconfigpath --cflags hiredis`"
+ HIREDIS_LIBS="`$pkgconfigpath --libs hiredis`"
+ AC_DEFINE([HAVE_HIREDIS],[1],[Define to 1 if hiredis is enabled])
+ else
+ AC_MSG_RESULT([no. Version 0.10 required])
+ if test "$hiredis" != "default"; then
+ AC_MSG_ERROR([hiredis libraries missing])
+ fi
fi
else
- if test "$pkgconfigpath" != "NONE"; then
- if $pkgconfigpath --exists openssl; then
- SSL_CFLAGS=`$pkgconfigpath --cflags openssl`
- LIBS="$LIBS `$pkgconfigpath --libs openssl`"
- sslver=`$pkgconfigpath --modversion openssl`
+ if test "$ac_cv_lib_hiredis_redisCommandArgv" = "yes"; then
+ AC_DEFINE([HAVE_HIREDIS],[1])
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ if test "$hiredis" != "default"; then
+ AC_MSG_ERROR([hiredis libraries missing])
fi
fi
- if test "$sslver" = "no"; then
- SSL_CFLAGS="-I/usr/include/openssl"
+ fi
+fi
+dnl ------ memcached
+memcached=default
+AC_SUBST([MEMCACHED_LIBS])
+AC_ARG_WITH([memcached], [ --with-memcached Memcached library], [memcached=$withval])
+if test "$memcached" != "no" -a -n "$libgcryptversion" -a "$pkgconfigpath" != "NONE"; then
+ AC_MSG_CHECKING([for libmemcached])
+ if $pkgconfigpath --cflags libmemcached >/dev/null 2>&1 ; then
+ if $pkgconfigpath --atleast-version 0.40 libmemcached; then
+ AC_MSG_RESULT([yes])
+ CFLAGS="$CFLAGS `$pkgconfigpath --cflags libmemcached`"
+ MEMCACHED_LIBS="`$pkgconfigpath --libs libmemcached`"
+ AC_DEFINE([HAVE_LIBMEMCACHED],[1],[Define to 1 if memcached is enabled])
+ else
+ AC_MSG_RESULT([no. Version 0.40 required])
+ if test "$memcached" != "default"; then
+ AC_MSG_ERROR([libmemcached libraries missing])
+ fi
+ fi
+ else
+ AC_MSG_RESULT([no])
+ if test "$memcached" != "default"; then
+ AC_MSG_ERROR([libmemcached libraries missing])
fi
fi
- if test "$sslver" = "no"; then
- xLIBS="$LIBS";
- xCPPFLAGS="$CPPFLAGS";
- CPPFLAGS="$CPPFLAGS $SSL_CFLAGS $SSL_LIBPATH"
- AC_CHECK_LIB(crypto, main)
- 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"
+fi
+dnl ------ GNU TLS
+AC_SUBST([SSL_CFLAGS])
+AC_SUBST([SSL_LIBS])
+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" != "yes"; then
- LIBS="$xLIBS"
+ 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
- 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
dnl
dnl ------ GNU Readline
READLINE_SHARED_LIBADD=""
-AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
- AC_CHECK_LIB(termcap, tgetent, [READLINE_SHARED_LIBADD="-ltermcap"])
+AC_CHECK_LIB([ncurses],[tgetent],[READLINE_SHARED_LIBADD="-lncurses"],
+ AC_CHECK_LIB([termcap],[tgetent],[READLINE_SHARED_LIBADD="-ltermcap"])
)
READLINE_LIBS=""
-AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline $READLINE_SHARED_LIBADD"],,$READLINE_SHARED_LIBADD)
-AC_CHECK_LIB(history, add_history, [READLINE_LIBS="$READLINE_LIBS -lhistory"])
+AC_CHECK_LIB([readline],[readline],[READLINE_LIBS="$READLINE_LIBS -lreadline $READLINE_SHARED_LIBADD"],,$READLINE_SHARED_LIBADD)
+AC_CHECK_LIB([history],[add_history],[READLINE_LIBS="$READLINE_LIBS -lhistory"])
if test "$ac_cv_lib_readline_readline" = "yes"; then
- AC_CHECK_HEADERS(readline/readline.h readline/history.h)
+ AC_CHECK_HEADERS([readline/readline.h readline/history.h])
xLIBS=$LIBS
LIBS="$LIBS $READLINE_LIBS"
AC_TRY_LINK([
#include <readline/readline.h>
],[
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 <stdio.h>
#include <readline/readline.h>
],[
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
-AC_ARG_WITH(iconv, [ --with-iconv[=PREFIX] iconv library in PREFIX])
+AC_ARG_WITH([iconv],[ --with-iconv[=PREFIX] iconv library in PREFIX])
if test "$with_iconv" != "no"; then
- AC_MSG_CHECKING(for iconv)
+ AC_MSG_CHECKING([for iconv])
oldLIBS="$LIBS"
oldCPPFLAGS="${CPPFLAGS}"
if test "$with_iconv" != "yes" -a "$with_iconv" != ""; then
],[
iconv_t t = iconv_open("", "");
],[
- AC_DEFINE(HAVE_ICONV_H)
- AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_ICONV_H],1,[Define to 1 if iconv.h is present])
+ AC_MSG_RESULT([yes])
],[
LIBS="$LIBS -liconv"
AC_TRY_LINK([
],[
iconv_t t = iconv_open("", "");
],[
- AC_DEFINE(HAVE_ICONV_H)
- AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_ICONV_H],1)
+ AC_MSG_RESULT([yes])
],[
LIBS="$oldLIBS"
CPPFLAGS="$oldCPPFLAGS"
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no])
])
])
fi
-dnl ------ libpcap / ziffy
-
-AC_SUBST(ZIFFY_PROG)
-AC_SUBST(PCAP_LIBS)
-AC_SUBST(PCAP_CFLAGS)
-ZIFFY_PROG=
-AC_ARG_WITH(pcap, [ --with-pcap[=DIR] libpcap root dir located in (dir)], [PCAP_DIR="$withval"],[PCAP_DIR=default])
-
-AC_MSG_CHECKING([for libpcap (required for ziffy)])
-if test "${PCAP_DIR}" != "no"; then
- if test "${PCAP_DIR}" != "yes" && test "${PCAP_DIR}" != "default"; then
- if test -r $PCAP_DIR/libpcap.a && test -r $PCAP_DIR/pcap.h; then
- PCAP_DIR="$PCAP_DIR"
- PCAP_LIBS="${LIBS} -L$PCAP_DIR -lpcap"
- PCAP_CFLAGS="${INCS} -I$PCAP_DIR"
- ZIFFY_PROG=ziffy
- fi
- else
- if test -d /usr/local &&
- test -r /usr/local/lib/libpcap.a &&
- test -r /usr/local/include/pcap.h; then
- PCAP_DIR="/usr/local"
- PCAP_LIBS="${LIBS} -L$PCAP_DIR/lib -lpcap"
- PCAP_CFLAGS="${INCS} -I$PCAP_DIR/include"
- ZIFFY_PROG=ziffy
- elif test -d /usr &&
- test -r /usr/lib/libpcap.a &&
- test -r /usr/include/pcap.h; then
- PCAP_DIR="/usr"
- PCAP_LIBS="${LIBS} -lpcap"
- ZIFFY_PROG=ziffy
- fi
- fi
-fi
-if test -z "$ZIFFY_PROG"; then
- AC_MSG_RESULT([not found. ziffy disabled])
- if test "${PCAP_DIR}" != "default" && test "${PCAP_DIR}" != "no"; then
- AC_MSG_ERROR([libpcap missing])
- fi
-else
- AC_MSG_RESULT([found in $PCAP_DIR])
-fi
-
dnl ------ various functions
-AC_CHECK_FUNCS(getaddrinfo vsnprintf gettimeofday poll strerror_r localtime_r usleep fopen64)
+AC_CHECK_FUNCS([getaddrinfo vsnprintf gettimeofday poll strerror_r localtime_r usleep fopen64])
case $host in
*-*-darwin*)
trypoll="no";
esac
if test "$ac_cv_func_poll" = "yes" -a "$trypoll" = "yes"; then
- AC_CHECK_HEADERS(sys/poll.h)
+ AC_CHECK_HEADERS([sys/poll.h])
fi
dnl ------ socklen_t
dnl We check for socklen_t by making prototypes with the
],,[ac_cv_check_socklen_t=size_t],[ac_cv_check_socklen_t=int])
])
])
-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_MSG_RESULT([$ac_cv_check_socklen_t])
+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])
+AC_ARG_ENABLE([tcpd],[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available])
if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
oldLibs=$LIBS
oldCPPFLAGS=$CPPFLAGS
LIBS="$LIBS -L$enable_tcpd/lib"
CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
fi
- AC_MSG_CHECKING(for working tcpd.h)
- LIBS="$LIBS -lwrap -lnsl"
+ AC_MSG_CHECKING([for working tcpd.h])
+ LIBS="$LIBS -lwrap"
AC_TRY_LINK([#include <syslog.h>
#include <tcpd.h>
int allow_severity = LOG_INFO;
[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_RESULT([no])
AC_MSG_ERROR([tcpd development libraries missing])
- LIBS=$oldLibs
- CPPFLAGS=$oldCPPFLAGS
+ CPPFLAGS=$oldCPPFLAGS
else
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_TCPD_H)
+ TCPD_LIBS="-lwrap"
+ AC_MSG_RESULT([yes])
+ 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
-HAVETHREADS=0
-dnl
-dnl ------ GNU threads
-AC_ARG_ENABLE(pth, [ --enable-pth enable GNU threads],[enable_pth=$enableval],[enable_pth=no])
-AC_SUBST(LIBPTH)
-if test "$enable_pth" = "yes"; then
- PTH_LIBS=""
- OLIBS=$LIBS
- AC_CHECK_LIB(pth,main)
- if test "$ac_cv_lib_pth_main" = "yes"; then
- AC_CHECK_HEADERS(pth.h)
- if test "$ac_cv_header_pth_h" = "yes"; then
- PTH_LIBS="-lpth"
- CFLAGS="$CFLAGS -DYAZ_GNU_THREADS=1"
- HAVETHREADS=1
- fi
- fi
- LIBS="$OLIBS $PTH_LIBS"
-fi
+AC_SUBST([YAZ_CONFIG_CFLAGS])
dnl
dnl ------ POSIX Threads
-AC_ARG_ENABLE(threads, [ --disable-threads disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
+HAVETHREADS=0
+AC_ARG_ENABLE([threads],[ --disable-threads disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
ACX_PTHREAD([
+ OCFLAGS=$CFLAGS
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- AC_DEFINE(YAZ_POSIX_THREADS)
- 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
done
LIBS=$OLIBS
fi
- LIBS="$PTHREAD_LIBS $LIBS"
- YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_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
dnl ----- libXSLT/libEXLT/libXML2
-AC_SUBST(XML2_CFLAGS)
+AC_SUBST([XML2_CFLAGS])
-YAZ_LIBXML2(
- [
- AC_DEFINE(YAZ_HAVE_XML2)
+xml_enabled=false
+YAZ_LIBXML2([
+ 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
fi
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)
-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`
+AC_CHECK_ICU([3.4],[
+ if test "$xml_enabled" = "true"; then
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"
+ else
+ ICU_CPPFLAGS=""
+ AC_MSG_WARN([ICU support disabled because XML support is unavailable])
+ fi
+])
+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
AC_OUTPUT([
Makefile
-yaz.spec
src/Makefile
test/Makefile
util/Makefile
client/Makefile
ztest/Makefile
zoom/Makefile
-ziffy/Makefile
doc/Makefile
-doc/local.ent
+doc/local0.ent
doc/common/Makefile
doc/common/print.dsl
etc/Makefile
yaz-config
yaz.pc
Doxyfile
-],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])
+win/version.nsi
+include/yaz/yaz-version.h
+],[
+ 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
+ ]
+)
echo \
projects / yaz-moved-to-github.git / blobdiff