X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=901096bbe74597305c6ccc82069f9c610fe88209;hb=36823208064a499a7813301dd494bdeb88d230d7;hp=da1694ac3a1a8275fbda0c4a7ba9d59ce5a8f689;hpb=2f1ad68193fa6825fc561a09684585280bd67895;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index da1694a..901096b 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.140 2004-05-02 00:07:34 adam Exp $
+dnl $Id: configure.in,v 1.154 2004-10-01 13:05:09 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.19)
+AM_INIT_AUTOMAKE(yaz, 2.0.26)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -15,7 +15,7 @@ test -z "$YACC" && AC_MSG_WARN([GNU bison not found])
 AC_PROG_INSTALL
 AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
-AC_PATH_PROG(pkgconfig, pkg-config, NONE)
+AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
 dnl
 YAZ_DOC
 dnl 
@@ -34,53 +34,52 @@ 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_LIBS=""
+SSL_LIBPATH=""
 if test "$openssl" != "no"; then
 	sslver=no
 	if test "$openssl" != "yes"; then
-		if $openssl/bin/pkg-config --exists openssl; then
-			SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
-			SSL_LIBS=`$openssl/bin/pkg-config --libs openssl`
-			sslver=`$openssl/bin/pkg-config --modversion openssl`
-		else
+		if test -x $openssl/bin/pkg-config; then
+			if $openssl/bin/pkg-config --exists openssl; then
+				SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
+				LIBS="$LIBS `$openssl/bin/pkg-config --libs openssl`"
+				sslver=`$openssl/bin/pkg-config --modversion openssl`
+			fi
+		fi
+		if test "$sslver" = "no"; then
                 	SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
-                	SSL_LIBS="-L$openssl/lib"
+                	SSL_LIBPATH="-L$openssl/lib"
 		fi
 	else
-		if test "$pkgconfig" != "NONE"; then
-			if $pkgconfig --exists openssl; then
-				SSL_CFLAGS=`$pkgconfig --cflags openssl`
-				SSL_LIBS=`$pkgconfig --libs openssl`
-				sslver=`$pkgconfig --modversion openssl`
+		if test "$pkgconfigpath" != "NONE"; then
+			if $pkgconfigpath --exists openssl; then
+				SSL_CFLAGS=`$pkgconfigpath --cflags openssl`
+				LIBS="$LIBS `$pkgconfigpath --libs openssl`"
+				sslver=`$pkgconfigpath --modversion openssl`
 			fi
 		fi
 		if test "$sslver" = "no"; then
                 	SSL_CFLAGS="-I/usr/include/openssl"
-                	SSL_LIBS=""
 		fi
 	fi
 	if test "$sslver" = "no"; then
 		xLIBS="$LIBS";
-		xCFLAGS="$CFLAGS";
-		CFLAGS="$CFLAGS $SSL_CFLAGS"
-		LIBS="$SSL_LIBS $LIBS"
-		AC_CHECK_LIB(crypto, main,[SSL_LIBS="$SSL_LIBS -lcrypto"])
-        	LIBS="$LIBS $SSL_LIBS"
+		xCPPFLAGS="$CPPFLAGS";
+		CPPFLAGS="$CPPFLAGS $SSL_CFLAGS $SSL_LIBPATH"
+		AC_CHECK_LIB(crypto, main)
 		AC_CHECK_LIB(ssl, SSL_new)
 		if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
 			AC_CHECK_HEADER(openssl/ssl.h,[sslver=yes])
+			LIBS="$SSL_LIBPATH $LIBS"
 		fi
-		if test "$sslver" = "yes"; then
-			SSL_LIBS="-lssl $SSL_LIBS"
+		if test "$sslver" != "yes"; then
+			LIBS="$xLIBS"
 		fi
-		LIBS="$xLIBS"
-		CFLAGS="$xCFLAGS"
+		CPPFLAGS="$xCPPFLAGS"
 	fi
 	if test "$sslver" != "no"; then
-		LIBS="$SSL_LIBS $LIBS"
 		CFLAGS="$CFLAGS -DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
 		USE_SSL=1
 	fi
@@ -104,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"
@@ -133,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)
@@ -142,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)
@@ -311,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