-dnl YAZ Toolkit, Index Data 1995-2007
-dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.77 2007-05-07 07:17:29 adam Exp $
-AC_PREREQ(2.59)
-AC_INIT([yaz],[3.0.1],[yaz-help@indexdata.dk])
-AC_CONFIG_SRCDIR(configure.ac)
+dnl This file is part of the YAZ toolkit.
+dnl Copyright (C) 1995-2009 Index Data
+AC_PREREQ([2.60])
+AC_INIT([yaz],[3.0.47],[yaz-help@indexdata.dk])
+AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE([1.8])
+AM_INIT_AUTOMAKE([1.9])
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')
+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([TCLSH], [tclsh tclsh8.5 tclsh8.4 tclsh8.3 tclsh8.2], [tclsh])
AC_PROG_INSTALL
AM_PROG_LIBTOOL
-AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
+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 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>
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"])])
+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])
+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
- 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"
- AC_CHECK_LIB(crypto, main)
- AC_CHECK_LIB(ssl, SSL_new)
+ 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"
+ AC_CHECK_HEADER([openssl/ssl.h],[sslver=yes])
+ 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=""
-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]))
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])])
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])
+ 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])
+ 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 "${ac_cv_header_netinet_if_ether_h}" = "no"; then
- :
- elif 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
- elif 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
-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])
+AC_DEFINE([YAZ_USE_NEW_LOG])
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;
i = hosts_access(&request_info);],
tcpd_ok=1, tcpd_ok=0)
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
else
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_TCPD_H)
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_TCPD_H])
fi
fi
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
fi
dnl ----- libXSLT/libEXLT/libXML2
-AC_SUBST(XML2_CFLAGS)
+AC_SUBST([XML2_CFLAGS])
-YAZ_LIBXML2(
- [
+xml_enabled=false
+YAZ_LIBXML2([
AC_DEFINE(YAZ_HAVE_XML2)
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)
+ 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
fi
dnl
+dnl
+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
dnl ------ Memory debugging
-AC_ARG_ENABLE(memdebug, [ --enable-memdebug enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])
+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)
+ AC_DEFINE([TRACE_XMALLOC],[2])
elif test "$enable_memdebug" = "no"; then
- AC_DEFINE(TRACE_XMALLOC,0)
+ 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)
+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);}'`
+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([
client/Makefile
ztest/Makefile
zoom/Makefile
-ziffy/Makefile
doc/Makefile
doc/local.ent
doc/common/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%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config
+ ]
+)
echo \
projects / yaz-moved-to-github.git / blobdiff