projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Link SSL with libyaz.la and yaz-client only.
[yaz-moved-to-github.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
575fc0e
..
6d2b5b7
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,7
+1,7
@@
dnl This file is part of the YAZ toolkit.
dnl Copyright (C) 1995-2008 Index Data
AC_PREREQ([2.60])
dnl This file is part of the YAZ toolkit.
dnl Copyright (C) 1995-2008 Index Data
AC_PREREQ([2.60])
-AC_INIT([yaz],[3.0.28],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[3.0.29],[yaz-help@indexdata.dk])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([1.9])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([1.9])
@@
-58,6
+58,7
@@
AC_CHECK_FUNC([gethostbyname], ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
dnl
dnl ------ OpenSSL
AC_SUBST([SSL_CFLAGS])
dnl
dnl ------ OpenSSL
AC_SUBST([SSL_CFLAGS])
+AC_SUBST([SSL_LIBS])
openssl=default
AC_ARG_WITH([openssl], [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
SSL_CFLAGS=""
openssl=default
AC_ARG_WITH([openssl], [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
SSL_CFLAGS=""
@@
-68,7
+69,7
@@
if test "$openssl" != "no"; 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`
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`"
+ SSL_LIBS="`$openssl/bin/pkg-config --libs openssl`"
sslver=`$openssl/bin/pkg-config --modversion openssl`
fi
fi
sslver=`$openssl/bin/pkg-config --modversion openssl`
fi
fi
@@
-80,7
+81,7
@@
if test "$openssl" != "no"; then
if test "$pkgconfigpath" != "NONE"; then
if $pkgconfigpath --exists openssl; then
SSL_CFLAGS=`$pkgconfigpath --cflags openssl`
if test "$pkgconfigpath" != "NONE"; then
if $pkgconfigpath --exists openssl; then
SSL_CFLAGS=`$pkgconfigpath --cflags openssl`
- LIBS="$LIBS `$pkgconfigpath --libs openssl`"
+ SSL_LIBS="`$pkgconfigpath --libs openssl`"
sslver=`$pkgconfigpath --modversion openssl`
fi
fi
sslver=`$pkgconfigpath --modversion openssl`
fi
fi
@@
-91,16
+92,21
@@
if test "$openssl" != "no"; then
if test "$sslver" = "no"; then
xLIBS="$LIBS";
xCPPFLAGS="$CPPFLAGS";
if test "$sslver" = "no"; then
xLIBS="$LIBS";
xCPPFLAGS="$CPPFLAGS";
- CPPFLAGS="$CPPFLAGS $SSL_CFLAGS $SSL_LIBPATH"
+ CPPFLAGS="$CPPFLAGS ${SSL_CFLAGS} ${SSL_LIBPATH}"
+ SSL_LIBS="${SSL_LIBPATH}"
AC_CHECK_LIB([crypto],[main])
AC_CHECK_LIB([crypto],[main])
+ if test "$ac_cv_lib_crypto_main" = "yes"; then
+ SSL_LIBS="${SSL_LIBS} -lcrypto"
+ fi
AC_CHECK_LIB([ssl],[SSL_new])
if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
AC_CHECK_HEADER([openssl/ssl.h],[sslver=yes])
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"
+ SSL_LIBS="${SSL_LIBS} -lssl"
fi
if test "$sslver" != "yes"; then
fi
if test "$sslver" != "yes"; then
- LIBS="$xLIBS"
+ SSL_LIBS=""
fi
fi
+ LIBS="$xLIBS"
CPPFLAGS="$xCPPFLAGS"
fi
AC_MSG_CHECKING([for SSL])
CPPFLAGS="$xCPPFLAGS"
fi
AC_MSG_CHECKING([for SSL])
@@
-272,6
+278,7
@@
dnl
AC_SUBST([YAZ_CONFIG_CFLAGS])
dnl
dnl ------ POSIX Threads
AC_SUBST([YAZ_CONFIG_CFLAGS])
dnl
dnl ------ POSIX Threads
+HAVETHREADS=0
AC_ARG_ENABLE([threads],[ --disable-threads disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
ACX_PTHREAD([
AC_ARG_ENABLE([threads],[ --disable-threads disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
ACX_PTHREAD([