X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=2997fdf03a5647910a064576b0d97f05687161ed;hp=4787a0c147f18d490553ba859cb631b06ef9d8aa;hb=d46ff174293651723309c8a33312bee64556c6e4;hpb=4c6462484342ee50f5d26f9fb3a625481b3d5bba

diff --git a/configure.in b/configure.in
index 4787a0c..2997fdf 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl YAZ Toolkit, Index Data 1994-2003
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.114 2003-06-04 13:28:37 adam Exp $
+dnl $Id: configure.in,v 1.120 2003-12-16 14:45:59 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.3)
+AM_INIT_AUTOMAKE(yaz, 2.0.7)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -15,6 +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)
 dnl
 dnl ----- DOCBOOK DTD
 AC_SUBST(DTD_DIR)
@@ -109,23 +110,44 @@ SSL_CFLAGS=""
 SSL_LIBS=""
 SSL_DEFS=""
 if test "$openssl" != "no"; then
+	sslver=no
 	xLIBS="$LIBS";
 	xCFLAGS="$CFLAGS";
 	if test "$openssl" != "yes"; then
-                SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
-                SSL_LIBS="-L$openssl/lib"
-		CFLAGS="$SSL_CFLAGS $CFLAGS"
-		LIBS="$SSL_LIBS $LIBS"
+		if $openssl/bin/pkg-config --exists openssl; then
+			SSL_CFLAGS=`$openssl/bin/pkgconfig --cflags openssl`
+			SSL_LIBS=`$openssl/bin/pkgconfig --libs openssl`
+			sslver=`$openssl/bin/pkgconfig --modversion openssl`
+		else
+                	SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
+                	SSL_LIBS="-L$openssl/lib"
+			CFLAGS="$SSL_CFLAGS $CFLAGS"
+			LIBS="$SSL_LIBS $LIBS"
+		fi
+	else
+		if $pkgconfig --exists openssl; then
+			SSL_CFLAGS=`$pkgconfig --cflags openssl`
+			SSL_LIBS=`$pkgconfig --libs openssl`
+			sslver=`$pkgconfig --modversion openssl`
+		fi	
+	fi
+	if test "$sslver" = "no"; then
+		AC_CHECK_LIB(crypto, main,[SSL_LIBS="$SSL_LIBS -lcrypto"])
+        	LIBS="$LIBS $SSL_LIBS"
+		AC_CHECK_LIB(ssl, SSL_new)
+		if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
+			AC_CHECK_HEADER(openssl/ssl.h,[sslver=yes])
+		fi
+		if test "$sslver" = "yes"; then
+			SSL_LIBS="$SSL_LIBS -lssl"
+		fi
 	fi
-	AC_CHECK_LIB(crypto, main,[SSL_LIBS="$SSL_LIBS -lcrypto"])
-        LIBS="$LIBS $SSL_LIBS"
-	AC_CHECK_LIB(ssl, SSL_new)
-	if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
-                SSL_LIBS="$SSL_LIBS -lssl"
-		AC_CHECK_HEADER(openssl/ssl.h,[SSL_DEFS="-DHAVE_OPENSSL_SSL_H=1"; USE_SSL=1])
-        else
-                SSL_LIBS=""
+	if test "$sslver" != "no"; then
+		SSL_DEFS="-DHAVE_OPENSSL_H=1"
+		USE_SSL=1
 	fi
+	AC_MSG_CHECKING([for SSL])
+	AC_MSG_RESULT($sslver)
 	LIBS="$xLIBS"
 	CFLAGS="$xCFLAGS"
 fi
@@ -395,18 +417,11 @@ dnl
 AC_OUTPUT([
 Makefile
 yaz.spec
+src/Makefile
+test/Makefile
 util/Makefile
-odr/Makefile
-z39.50/Makefile
-ill/Makefile
-zutil/Makefile
-comstack/Makefile
-ccl/Makefile
-cql/Makefile
-server/Makefile
 include/Makefile
 include/yaz/Makefile
-lib/Makefile
 client/Makefile
 ztest/Makefile
 zoom/Makefile
@@ -419,4 +434,4 @@ doc/tkl.xsl
 doc/yazhtml.xsl
 etc/Makefile
 yaz-config
-],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > lib/yaz-config && chmod +x yaz-config lib/yaz-config])
+],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])