dnl This file is part of the YAZ toolkit.
-dnl Copyright (C) 1995-2010 Index Data
+dnl Copyright (C) Index Data
+dnl See the file LICENSE for details.
AC_PREREQ([2.60])
-AC_INIT([yaz],[4.0.3],[yaz-help@indexdata.dk])
+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.9])
+AM_INIT_AUTOMAKE([1.11.1 subdir-objects])
dnl
AC_SUBST([READLINE_LIBS])
AC_SUBST([YAZ_CONF_CFLAGS])
AC_PATH_PROG([pkgconfigpath],[pkg-config],[NONE])
dnl
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],[],[],[])
+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],[],[],[])
AC_CHECK_HEADERS([net/if.h netinet/in.h netinet/if_ether.h],[],[],[
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
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])
-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
- 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`
- SSL_LIBS="`$openssl/bin/pkg-config --libs openssl`"
- sslver=`$openssl/bin/pkg-config --modversion openssl`
- fi
- fi
- if test "$sslver" = "no"; then
- SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
- SSL_LIBPATH="-L$openssl/lib"
- fi
+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
- if test "$pkgconfigpath" != "NONE"; then
- if $pkgconfigpath --exists openssl; then
- SSL_CFLAGS=`$pkgconfigpath --cflags openssl`
- SSL_LIBS="`$pkgconfigpath --libs openssl`"
- sslver=`$pkgconfigpath --modversion openssl`
- fi
- fi
- if test "$sslver" = "no"; then
- SSL_CFLAGS="-I/usr/include/openssl"
- fi
+ libgcrypt=$libgcryptpath
fi
- if test "$sslver" = "no"; then
- xLIBS="$LIBS";
- xCPPFLAGS="$CPPFLAGS";
- 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])
- SSL_LIBS="${SSL_LIBS} -lssl"
- fi
- if test "$sslver" != "yes"; then
- SSL_LIBS=""
+ 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
- LIBS="$xLIBS"
- 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])
else
- SSL_CFLAGS=""
- AC_MSG_RESULT([None])
- if test "$openssl" != "default"; then
- AC_MSG_ERROR([OpenSSL development libraries missing])
+ AC_MSG_RESULT([no])
+ 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"; then
+ AC_CHECK_LIB([memcached],[memcached_get], [MEMCACHED_LIBS="-lmemcached"])
+ if test "$ac_cv_lib_memcached_memcached_get" = "yes"; then
+ AC_CHECK_HEADERS([libmemcached/memcached.h])
+ if test "$ac_cv_header_libmemcached_memcached_h" = "yes"; then
+ AC_CHECK_LIB([memcached],[memcached], [
+ AC_DEFINE([HAVE_MEMCACHED_FUNC],[1],[Define to 1 if memcached function is defined])])
+ AC_TRY_COMPILE(
+ [
+#include <libmemcached/memcached.h>
+ ],[
+ memcached_return_t x;
+ ],[AC_DEFINE([HAVE_MEMCACHED_RETURN_T],[1],[Define to 1 if memcached_return_t is defined])]
+ )
fi
fi
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" -a "$sslver" = "no"; then
+if test "$gnutls" != "no"; then
gnutlsver=no
if test "$gnutls" != "yes" -a "$gnutls" != "default"; then
if test -x $gnutls/bin/pkg-config; then
fi
AC_MSG_CHECKING([for GNU TLS])
if test "$gnutlsver" != "no"; then
- SSL_CFLAGS="-DHAVE_GNUTLS_H=1 $SSL_CFLAGS"
+ AC_DEFINE([HAVE_GNUTLS_H],[1],[Define to 1 if GNUTLS is present])
AC_MSG_RESULT([$gnutlsver])
else
SSL_CFLAGS=""
#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
],[
iconv_t t = iconv_open("", "");
],[
- AC_DEFINE([HAVE_ICONV_H])
+ AC_DEFINE([HAVE_ICONV_H],1,[Define to 1 if iconv.h is present])
AC_MSG_RESULT([yes])
],[
LIBS="$LIBS -liconv"
],[
iconv_t t = iconv_open("", "");
],[
- AC_DEFINE([HAVE_ICONV_H])
+ AC_DEFINE([HAVE_ICONV_H],1)
AC_MSG_RESULT([yes])
],[
LIBS="$oldLIBS"
])
])
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_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])
[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_ERROR([tcpd development libraries missing])
- LIBS=$oldLibs
- CPPFLAGS=$oldCPPFLAGS
+ CPPFLAGS=$oldCPPFLAGS
else
+ TCPD_LIBS="-lwrap"
AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_TCPD_H])
+ 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
ACX_PTHREAD([
OCFLAGS=$CFLAGS
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- 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
- CFLAGS="$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
xml_enabled=false
YAZ_LIBXML2([
- AC_DEFINE(YAZ_HAVE_XML2)
+ 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
])
if test "$xml_enabled" = "true"; then
YAZ_LIBXSLT([
- AC_DEFINE(YAZ_HAVE_XSLT)
+ 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)
+ 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"
fi
dnl
-dnl
+dnl
AC_CHECK_ICU([3.4],[
if test "$xml_enabled" = "true"; then
ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"
AC_MSG_WARN([ICU support disabled because XML support is unavailable])
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`
-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);}'`
dnl
AC_OUTPUT([
Makefile
-yaz.spec
src/Makefile
test/Makefile
util/Makefile
ztest/Makefile
zoom/Makefile
doc/Makefile
-doc/local.ent
+doc/local0.ent
doc/common/Makefile
doc/common/print.dsl
etc/Makefile
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
+ 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
]
)
projects / yaz-moved-to-github.git / blobdiff