X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=configure.in;h=a5b1f94cf27d38d7973ed0eaaa470985f22e306f;hb=3a2124aa85eea0583c7528bcc6f79a5fa1632a40;hp=ab406faf091427d8d5cd57e3802c1511c55348aa;hpb=d879f319799e3f54221769b8cfaa1e55e3331e1f;p=idzebra-moved-to-github.git diff --git a/configure.in b/configure.in index ab406fa..a5b1f94 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ dnl Zebra, Index Data Aps, 1995-2005 -dnl $Id: configure.in,v 1.91.2.7 2005-01-23 15:47:27 adam Exp $ +dnl $Id: configure.in,v 1.91.2.23 2006-06-07 07:43:47 adam Exp $ dnl AC_INIT(include/zebraver.h) -AM_INIT_AUTOMAKE(idzebra,1.3.22) +AM_INIT_AUTOMAKE(idzebra,1.3.36) dnl ------ Substitutions AC_SUBST(TCL_INCLUDE) AC_SUBST(TCL_LIB) @@ -21,7 +21,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 +81,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 +105,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 @@ -122,7 +130,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) @@ -131,7 +139,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) @@ -244,7 +252,7 @@ if test "$perl" != "no"; then AC_TRY_LINK([ #include ],[ - static void f() + void f() { ; } @@ -339,13 +347,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