Fix LFS check which on some systems, such as Solaris, reports LFS false -

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

diff --git a/configure.in b/configure.in
index 05e24f2..464e3b7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,10 @@
-dnl Zebra, Index Data Aps, 1995-2004
-dnl $Id: configure.in,v 1.91.2.5 2004-11-10 21:14:14 adam Exp $
+dnl Zebra, Index Data Aps, 1995-2006
+dnl $Id: configure.in,v 1.91.2.27 2006-09-19 19:16:34 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
-AM_INIT_AUTOMAKE(idzebra,1.3.19)
+AM_INIT_AUTOMAKE(idzebra,1.3.38)
+PACKAGE_SUFFIX="-1.3"
+AC_SUBST(PACKAGE_SUFFIX)
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
@@ -21,7 +23,15 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 dnl
-YAZ_INIT($yazflag)
+dnl ------ threads
+AC_ARG_ENABLE(threads, [  --disable-threads       disable threads],[enable_threa
+ds=$enableval],[enable_threads=yes])
+if test "$enable_threads" = "yes"; then
+       yazflag=threads
+else
+       yazflag=""
+fi
+YAZ_INIT($yazflag,2.0.18)
 YAZ_DOC
 dnl ------ Look for Tcl
 dnl See if user has specified location of tclConfig.sh; otherwise
@@ -73,6 +83,12 @@ dnl
 dnl ------ times
 AC_CHECK_HEADERS(sys/times.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)
 dnl
@@ -91,20 +107,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
@@ -122,7 +132,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)
@@ -131,7 +141,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)
@@ -244,7 +254,7 @@ if test "$perl" != "no"; then
             AC_TRY_LINK([
             #include <stdio.h>
              ],[
-            static void f()
+            void f()
             {
                ;
             }
@@ -280,9 +290,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);
@@ -339,13 +348,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