X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=configure.in;h=dd3f75edacc67aa8e828e8a49dc5b151cbe1ba7d;hb=d310ea540d84722bcda486995c29b4dd2b08cb61;hp=07e47977ccf5eb5fd359de6d8dd561e2b920397e;hpb=999c147df0180092e5a64de90e58c2a1a15a0018;p=idzebra-moved-to-github.git diff --git a/configure.in b/configure.in index 07e4797..dd3f75e 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,10 @@ -dnl Zebra, Index Data Aps, 1995-2005 -dnl $Id: configure.in,v 1.91.2.13 2005-05-30 13:43:06 adam Exp $ +dnl Zebra, Index Data Aps, 1995-2006 +dnl $Id: configure.in,v 1.91.2.30 2006-10-16 11:02:09 adam Exp $ dnl AC_INIT(include/zebraver.h) -AM_INIT_AUTOMAKE(idzebra,1.3.28) +AM_INIT_AUTOMAKE(idzebra,1.3.42) +PACKAGE_SUFFIX="-1.3" +AC_SUBST(PACKAGE_SUFFIX) dnl ------ Substitutions AC_SUBST(TCL_INCLUDE) AC_SUBST(TCL_LIB) @@ -72,7 +74,11 @@ 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} else AC_MSG_RESULT(Not found) AC_DEFINE(HAVE_TCL_H,0) @@ -105,20 +111,14 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then AC_TRY_LINK([ #include #include - ],[ - static void f() - { - rl_attempted_completion_over = 0; - } + ],[ + rl_attempted_completion_over = 0; ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER)) AC_TRY_LINK([ #include #include ],[ - static void f() - { rl_completion_matches (0, 0); - } ],AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES)) LIBS=$xLIBS fi @@ -136,7 +136,7 @@ if test "$with_iconv" != "no"; then AC_TRY_LINK([ #include ],[ - static void f() {iconv_t t = iconv_open("", ""); } + iconv_t t = iconv_open("", ""); ],[ AC_DEFINE(HAVE_ICONV_H) AC_MSG_RESULT(yes) @@ -145,7 +145,7 @@ if test "$with_iconv" != "no"; then AC_TRY_LINK([ #include ],[ - static void f() {iconv_t t = iconv_open("", ""); } + iconv_t t = iconv_open("", ""); ],[ AC_DEFINE(HAVE_ICONV_H) AC_MSG_RESULT(yes) @@ -258,7 +258,7 @@ if test "$perl" != "no"; then AC_TRY_LINK([ #include ],[ - static void f() + void f() { ; } @@ -294,9 +294,8 @@ int main(int argc, char **argv) if (sizeof(off_t) != 8) exit (1); o = 2000000000; - sprintf (tmp_str, "%Ld", o+o+o); - if (strcmp (tmp_str, "6000000000")) - exit (1); + if ((o+o+o) / 3 != o) + exit(1); fd = creat ("config.tmp", 0644); if (fd < 0) exit (1); @@ -353,6 +352,7 @@ AC_OUTPUT([ test/dmoz/Makefile test/xpath/Makefile test/sort/Makefile test/zsh/Makefile test/marcxml/Makefile test/charmap/Makefile test/codec/Makefile examples/Makefile examples/gils/Makefile examples/zthes/Makefile + examples/mail/Makefile idzebra.spec ]) if test -x "$perlbin"; then