X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=db3dbeaa47f6bf9919b521351ee9a982a65f0872;hb=d57c9b0a346d64f0ed2a1003d90365794564e0b6;hp=5f5648b6262ffde5d167cfdefe8fb3ac74c7fb5e;hpb=e23eae6ada71a70849bcdab7ee179579aad248e1;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index 5f5648b..db3dbea 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.139 2004-05-01 23:32:20 adam Exp $
+dnl $Id: configure.in,v 1.145 2004-05-19 05:28:06 oleg Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.19)
+AM_INIT_AUTOMAKE(yaz, 2.0.21)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -37,44 +37,49 @@ openssl=no
 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 "$pkgconfig" != "NONE"; 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 $pkgconfig --exists openssl; then
-			SSL_CFLAGS=`$pkgconfig --cflags openssl`
-			SSL_LIBS=`$pkgconfig --libs openssl`
-			sslver=`$pkgconfig --modversion openssl`
-		fi	
+		if test "$pkgconfig" != "NONE"; then
+			if $pkgconfig --exists openssl; then
+				SSL_CFLAGS=`$pkgconfig --cflags openssl`
+				LIBS="$LIBS `$pkgconfig --libs openssl`"
+				sslver=`$pkgconfig --modversion openssl`
+			fi
+		fi
+		if test "$sslver" = "no"; then
+                	SSL_CFLAGS="-I/usr/include/openssl"
+		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
@@ -148,7 +153,7 @@ if test "$with_iconv" != "no"; then
 	])
 fi
 dnl ------ various functions
-AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r)
+AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r dprintf)
 if test "$ac_cv_func_poll" = "yes"; then
         AC_CHECK_HEADERS(sys/poll.h)
 fi