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.149 2004-08-11 09:05:56 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.19)
+AM_INIT_AUTOMAKE(yaz, 2.0.23)
AM_MAINTAINER_MODE
dnl
AC_SUBST(READLINE_LIBS)
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
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 $pkgconfig --exists openssl; then
- SSL_CFLAGS=`$pkgconfig --cflags openssl`
- SSL_LIBS=`$pkgconfig --libs openssl`
- sslver=`$pkgconfig --modversion openssl`
- fi
+ 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"
+ 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