X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=configure.in;h=f6d105fac2eb5c08d4c9fdb5da0da824bce7f24a;hb=e494610db1c879925ce6d9e1c4efcf86904f243c;hp=db3dbeaa47f6bf9919b521351ee9a982a65f0872;hpb=422c5109f981fefdd87bd3f95c41cc799a645ffc;p=yaz-moved-to-github.git

diff --git a/configure.in b/configure.in
index db3dbea..f6d105f 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.145 2004-05-19 05:28:06 oleg Exp $
+dnl $Id: configure.in,v 1.149 2004-08-11 09:05:56 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.21)
+AM_INIT_AUTOMAKE(yaz, 2.0.23)
 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 
@@ -41,7 +41,7 @@ SSL_LIBPATH=""
 if test "$openssl" != "no"; then
 	sslver=no
 	if test "$openssl" != "yes"; then
-		if test "$pkgconfig" != "NONE"; then
+		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`"
@@ -53,11 +53,11 @@ if test "$openssl" != "no"; then
                 	SSL_LIBPATH="-L$openssl/lib"
 		fi
 	else
-		if test "$pkgconfig" != "NONE"; then
-			if $pkgconfig --exists openssl; then
-				SSL_CFLAGS=`$pkgconfig --cflags openssl`
-				LIBS="$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
@@ -153,7 +153,7 @@ if test "$with_iconv" != "no"; then
 	])
 fi
 dnl ------ various functions
-AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r dprintf)
+AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r)
 if test "$ac_cv_func_poll" = "yes"; then
         AC_CHECK_HEADERS(sys/poll.h)
 fi