Fix typo.

[yaz-moved-to-github.git] / configure.in

diff --git a/configure.in b/configure.in
index ac06478..69318a4 100644 (file)
--- 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.141 2004-05-10 11:24:59 adam Exp $
+dnl $Id: configure.in,v 1.147 2004-06-15 09:58:13 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.20)
+AM_INIT_AUTOMAKE(yaz, 2.0.21)
 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 
@@ -37,50 +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 -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