X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=8cf0f1e32758f5f76c16aba6efb3eebe9b3937cd;hp=f989b6a7c67e28c4dd392ef9547116a98e492354;hb=5242fd311bad9fc07b7ddf77f4d83410928d968c;hpb=e6df9ccd224fb620edee84759930de8886e5baf8 diff --git a/configure.ac b/configure.ac index f989b6a..8cf0f1e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,8 @@ -dnl Zebra, Index Data ApS, 1995-2008 +dnl This file is part of the Zebra server. +dnl Copyright (C) 1994-2009 Index Data dnl AC_PREREQ(2.60) -AC_INIT([idzebra],[2.0.34],[zebra-help@indexdata.dk]) +AC_INIT([idzebra],[2.0.41],[zebra-help@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([1.9]) @@ -173,6 +174,11 @@ else fi fi dnl +dnl ------- zlib +AC_CHECK_LIB([z],[compress2]) +if test "$ac_cv_lib_z_compress2" = "yes"; then + AC_CHECK_HEADERS([zlib.h]) +fi dnl ------ -lm AC_CHECK_LIB(m,sqrt) dnl ------ -ldl @@ -287,13 +293,28 @@ ZEBRA_MODULE(safari,shared,[ --enable-mod-safari Safari filter (DBC)]) dnl ------ ANSI C Header files AC_STDC_HEADERS if test "$ac_cv_header_stdc" = "no"; then - AC_MSG_WARN(Your system doesn't seem to support ANSI C) + AC_MSG_WARN([Your system does not seem to support ANSI C]) fi AC_SUBST(IDZEBRA_SRC_ROOT) AC_SUBST(IDZEBRA_BUILD_ROOT) IDZEBRA_SRC_ROOT=`cd ${srcdir}; pwd` IDZEBRA_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 ------ Create Makefiles +dnl AC_OUTPUT([ Makefile util/Makefile @@ -332,6 +353,8 @@ AC_OUTPUT([ idzebra.spec idzebra-config-2.0 Doxyfile + win/version.nsi + include/idzebra/version.h ],[sed s%echo_source=yes%echo_source=no%g < idzebra-config-2.0 > util/idzebra-config-2.0 && chmod +x idzebra-config-2.0 util/idzebra-config-2.0]) echo \