X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=1edfa93fc159ab4ef93b15a7f5287e905c254dc5;hb=1b8b5cb2b718a805d40ce904c270ea5fbf5b1e7c;hp=69318a426873117aefeb34f338d09c0f4cec55f3;hpb=f4c4fc8248cfd5ceb834003b237359343aca9b38;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 69318a4..1edfa93 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2004
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.147 2004-06-15 09:58:13 adam Exp $
+dnl $Id: configure.in,v 1.152 2004-09-29 20:44:44 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.21)
+AM_INIT_AUTOMAKE(yaz, 2.0.24)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -34,7 +34,7 @@ AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 dnl
 dnl ------ OpenSSL
 openssl=no
-AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
+AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX]   OpenSSL library in PREFIX], [openssl=$withval])
 USE_SSL=0
 SSL_CFLAGS=""
 SSL_LIBPATH=""
@@ -103,24 +103,18 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
 	#include <stdio.h>
 	#include <readline/readline.h>
 	],[
-        static void f()
-        {
                 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))
+        ],[AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES)])
         LIBS=$xLIBS
 fi
 dnl ------ iconv
-AC_ARG_WITH(iconv, [  --with-iconv[=PREFIX]   iconv library in PREFIX])
+AC_ARG_WITH(iconv, [  --with-iconv[=PREFIX]     iconv library in PREFIX])
 if test "$with_iconv" != "no"; then
         AC_MSG_CHECKING(for iconv)
 	oldLIBS="$LIBS"
@@ -132,7 +126,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)
@@ -141,7 +135,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)
@@ -310,7 +304,7 @@ dnl ----- libXML2
 AC_SUBST(XML2_LIBS)
 AC_SUBST(XML2_CFLAGS)
 xml2dir=yes
-AC_ARG_WITH(xml2, [  --with-xml2[=PREFIX]    use libxml2 in PREFIX],[xml2dir=$withval])
+AC_ARG_WITH(xml2, [  --with-xml2[=PREFIX]      use libxml2 in PREFIX],[xml2dir=$withval])
 if test "$xml2dir" = "yes"; then
 	for d in /usr /usr/local; do
 		if test -x $d/bin/xml2-config; then