dnl YAZ Toolkit, Index Data 1994-2004
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.144 2004-05-14 08:19:16 adam Exp $
+dnl $Id: configure.in,v 1.151 2004-09-22 14:50:04 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)
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
dnl
dnl ------ OpenSSL
openssl=no
-AC_ARG_WITH(openssl, [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
+AC_ARG_WITH(openssl, [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
USE_SSL=0
SSL_CFLAGS=""
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`"
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
#include <stdio.h>
#include <readline/readline.h>
],[
- static void f()
- {
rl_attempted_completion_over = 0;
- }
],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER))
AC_TRY_LINK([
#include <stdio.h>
#include <readline/readline.h>
],[
- static void f()
- {
rl_completion_matches (0, 0);
- }
- ],AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES))
+ ],[AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES)])
LIBS=$xLIBS
fi
dnl ------ iconv
-AC_ARG_WITH(iconv, [ --with-iconv[=PREFIX] iconv library in PREFIX])
+AC_ARG_WITH(iconv, [ --with-iconv[=PREFIX] iconv library in PREFIX])
if test "$with_iconv" != "no"; then
AC_MSG_CHECKING(for iconv)
oldLIBS="$LIBS"
AC_TRY_LINK([
#include <iconv.h>
],[
- static void f() {iconv_t t = iconv_open("", ""); }
+ iconv_t t = iconv_open("", "");
],[
AC_DEFINE(HAVE_ICONV_H)
AC_MSG_RESULT(yes)
AC_TRY_LINK([
#include <iconv.h>
],[
- static void f() {iconv_t t = iconv_open("", ""); }
+ iconv_t t = iconv_open("", "");
],[
AC_DEFINE(HAVE_ICONV_H)
AC_MSG_RESULT(yes)
AC_SUBST(XML2_LIBS)
AC_SUBST(XML2_CFLAGS)
xml2dir=yes
-AC_ARG_WITH(xml2, [ --with-xml2[=PREFIX] use libxml2 in PREFIX],[xml2dir=$withval])
+AC_ARG_WITH(xml2, [ --with-xml2[=PREFIX] use libxml2 in PREFIX],[xml2dir=$withval])
if test "$xml2dir" = "yes"; then
for d in /usr /usr/local; do
if test -x $d/bin/xml2-config; then