dnl This file is part of the YAZ toolkit.
-dnl Copyright (C) 1995-2008 Index Data
+dnl Copyright (C) 1995-2011 Index Data
AC_PREREQ([2.60])
-AC_INIT([yaz],[3.0.32],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[4.2.13],[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])
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 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>
fi
AC_MSG_CHECKING([for SSL])
if test "$sslver" != "no"; then
- SSL_CFLAGS="-DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
+ AC_DEFINE([HAVE_OPENSSL_SSL_H],[1],[Define to 1 if OpenSSL is present])
AC_MSG_RESULT([$sslver])
else
SSL_CFLAGS=""
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
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
done
LIBS=$OLIBS
fi
- CFLAGS=$OCFLAGS
- PTHREAD_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
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
])
-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
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_MSG_WARN([ICU support disabled because XML support is unavailable])
fi
])
+dnl ------ versioning
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])
+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
-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 ------ windows version files
-WIN_FILEVERSION=`echo $PACKAGE_VERSION|tr . ,`.1
+AC_SUBST([VERSION_SHA1])
dnl
dnl ------ Makefiles
dnl
AC_OUTPUT([
Makefile
-yaz.spec
src/Makefile
test/Makefile
util/Makefile
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
+ sed s%echo_source=yes%echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config
]
)
projects / yaz-moved-to-github.git / blobdiff