Towards 1.3.48.

[idzebra-moved-to-github.git] / configure.in

diff --git a/configure.in b/configure.in
index f5e5bed..f23fe68 100644 (file)
--- 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.10 2005-05-04 11:48:13 adam Exp $
+dnl Zebra, Index Data Aps, 1995-2006
+dnl $Id: configure.in,v 1.91.2.34 2006-12-22 18:43:32 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
-AM_INIT_AUTOMAKE(idzebra,1.3.26)
+AM_INIT_AUTOMAKE(idzebra,1.3.48)
+PACKAGE_SUFFIX="-1.3"
+AC_SUBST(PACKAGE_SUFFIX)
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
@@ -29,7 +31,7 @@ if test "$enable_threads" = "yes"; then
 else
        yazflag=""
 fi
-YAZ_INIT($yazflag)
+YAZ_INIT($yazflag,2.0.18)
 YAZ_DOC
 dnl ------ Look for Tcl
 dnl See if user has specified location of tclConfig.sh; otherwise
@@ -72,14 +74,24 @@ 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)
 fi
 dnl
 dnl ------ times
-AC_CHECK_HEADERS(sys/times.h)
+AC_CHECK_HEADERS(sys/times.h sys/time.h)
+dnl
+dnl ------ crypt
+AC_CHECK_LIB(crypt, crypt)
+if test "$ac_cv_lib_crypt_crypt" = "yes"; then
+       AC_CHECK_HEADERS(crypt.h)
+fi
 dnl
 dnl ------ mkstemp
 AC_CHECK_FUNCS(mkstemp)
@@ -99,20 +111,14 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
         AC_TRY_LINK([
         #include <stdio.h>
         #include <readline/readline.h>
-        ],[
-        static void f()
-        {
-                rl_attempted_completion_over = 0;
-        }
+        ],[ 
+               rl_attempted_completion_over = 0;
         ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER))
         AC_TRY_LINK([
         #include <stdio.h>
         #include <readline/readline.h>
         ],[
-        static void f()
-        {
                 rl_completion_matches (0, 0);
-        }
         ],AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES))
         LIBS=$xLIBS
 fi
@@ -130,7 +136,7 @@ if test "$with_iconv" != "no"; then
        AC_TRY_LINK([
                #include <iconv.h>
        ],[
-               static void f() {iconv_t t = iconv_open("", ""); }
+               iconv_t t = iconv_open("", "");
        ],[
                AC_DEFINE(HAVE_ICONV_H)
                AC_MSG_RESULT(yes)
@@ -139,7 +145,7 @@ if test "$with_iconv" != "no"; then
                AC_TRY_LINK([
                        #include <iconv.h>
                ],[
-                       static void f() {iconv_t t = iconv_open("", ""); }
+                       iconv_t t = iconv_open("", "");
                ],[
                        AC_DEFINE(HAVE_ICONV_H)
                        AC_MSG_RESULT(yes)
@@ -252,7 +258,7 @@ if test "$perl" != "no"; then
             AC_TRY_LINK([
             #include <stdio.h>
              ],[
-            static void f()
+            void f()
             {
                ;
             }
@@ -288,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);
@@ -347,13 +352,14 @@ 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
        res=`cd perl ; $perlbin Makefile.PL ; cd .. ;`;
 fi
 if test  -z "$YAZLIB"; then
-       echo "YAZ was not found. Use --with-yazconfig=DIR to specify location."
+       echo "YAZ was not found. Use --with-yaz=DIR to specify location."
        test -f /etc/debian_version && echo "Debian package libyaz-dev is required."
 fi