X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.ac;h=87286490261ae3d8c8fda0969a1b47e514134ea8;hb=6cf7c0bdb8d8e4a101771d234830539c2f55dc0e;hp=eac51c10e53d215da1e4f01bdd8c1dc5359684ee;hpb=a1c7ea4ea8821a0c837850f147893c0b35ae63dd;p=idzebra-moved-to-github.git diff --git a/configure.ac b/configure.ac index eac51c1..8728649 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl Zebra, Index Data ApS, 1995-2006 -dnl $Id: configure.ac,v 1.30 2006-09-29 13:03:06 adam Exp $ +dnl $Id: configure.ac,v 1.34 2006-10-16 11:03:47 adam Exp $ dnl AC_PREREQ(2.59) -AC_INIT([idzebra],[2.0.3],[adam@indexdata.dk]) +AC_INIT([idzebra],[2.0.4],[adam@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([1.8]) @@ -17,6 +17,7 @@ dnl ------ Substitutions AC_SUBST(TCL_INCLUDE) AC_SUBST(TCL_LIB) AC_SUBST(READLINE_LIBS) +AC_SUBST(ZEBRA_CFLAGS) dnl dnl ------ Checking programs AC_PROG_CC @@ -40,7 +41,7 @@ else fi dnl dnl ------ YAZ -YAZ_INIT($yazflag,2.1.20) +YAZ_INIT($yazflag,2.1.35) if test "$YAZVERSION" = "NONE"; then AC_MSG_ERROR([YAZ development libraries required]) fi @@ -117,8 +118,12 @@ if test -r ${tclconfig}/tclConfig.sh; then SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX SHLIB_VERSION=$TCL_SHLIB_VERSION AC_MSG_RESULT($TCL_VERSION) - AC_DEFINE(HAVE_TCL_H,1) - + + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS="${TCL_INCLUDE} $CPPFLAGS" + AC_CHECK_HEADERS(tcl.h) + CPPFLAGS=${old_CPPFLAGS} + # The Mac OSX -framework causes problems with Libtool # and dependancy libs.. so apply Tcl libs everywhere bug #461 case $host in @@ -274,7 +279,8 @@ else fi AC_CHECK_SIZEOF([off_t]) AC_CHECK_SIZEOF([long long]) -AC_CHECK_SIZEOF([long]) +ZEBRA_CFLAGS="-DZEBRA_ZINT=${ac_cv_sizeof_long_long}" +AC_DEFINE_UNQUOTED(ZEBRA_ZINT,${ac_cv_sizeof_long_long}) dnl ------ Modules AC_SUBST(SHARED_MODULE_LA) SHARED_MODULE_LA=""