-dnl YAZ Toolkit, Index Data 1994-2004
+dnl YAZ Toolkit, Index Data 1994-2005
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.156 2004-10-03 22:34:07 adam Exp $
+dnl $Id: configure.in,v 1.189 2005-12-17 20:20:55 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.26)
+AM_INIT_AUTOMAKE(yaz, 2.1.11)
AM_MAINTAINER_MODE
dnl
AC_SUBST(READLINE_LIBS)
dnl
YAZ_DOC
dnl
+dnl
+dnl ------ Headers
+AC_CHECK_HEADERS(dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/types.h sys/un.h sys/wait.h unistd.h)
+AC_HEADER_STDC
+if test "$ac_cv_header_stdc" = "no"; then
+ AC_MSG_WARN(Your system doesn't seem to support ANSI C)
+fi
+dnl ----- Types
+AC_CHECK_TYPES([long long])
+dnl
dnl ----- Sockets
checkBoth=0
AC_CHECK_FUNC(connect)
LIBS="$LIBS -lsocket -lnsl"
AC_CHECK_FUNC(accept, , [LIBS=$oldLibs])
fi
-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
+AC_CHECK_FUNC(gethostbyname, ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
dnl
dnl ------ OpenSSL
+AC_SUBST(SSL_CFLAGS)
openssl=no
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
fi
CPPFLAGS="$xCPPFLAGS"
fi
+ AC_MSG_CHECKING([for SSL])
if test "$sslver" != "no"; then
- CFLAGS="$CFLAGS -DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
- USE_SSL=1
+ SSL_CFLAGS="-DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
+ AC_MSG_RESULT([$sslver])
+ else
+ SSL_CFLAGS=""
+ AC_MSG_RESULT([None])
+ AC_MSG_ERROR([OpenSSL development libraries missing])
fi
- AC_MSG_CHECKING([for SSL])
- AC_MSG_RESULT($sslver)
fi
dnl
dnl ------ GNU Readline
])
fi
dnl ------ various functions
-AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r)
-if test "$ac_cv_func_poll" = "yes"; then
+AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r localtime_r usleep fopen64)
+case $host in
+*-*-darwin*)
+ trypoll="no";
+ ;;
+*)
+ trypoll="yes";
+ ;;
+esac
+
+if test "$ac_cv_func_poll" = "yes" -a "$trypoll" = "yes"; then
AC_CHECK_HEADERS(sys/poll.h)
fi
dnl ------ socklen_t
])
AC_MSG_RESULT($ac_cv_check_socklen_t)
AC_DEFINE_UNQUOTED(YAZ_SOCKLEN_T,$ac_cv_check_socklen_t)
+AC_DEFINE(YAZ_USE_NEW_LOG)
dnl
dnl ------ tcpd
AC_ARG_ENABLE(tcpd,[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available])
fi
fi
dnl
-dnl ------ Headers
-AC_CHECK_HEADERS(fnmatch.h wchar.h locale.h langinfo.h)
-AC_STDC_HEADERS
-if test "$ac_cv_header_stdc" = "no"; then
- AC_MSG_WARN(Your system doesn't seem to support ANSI C)
-fi
-dnl
-AC_SUBST(LIBTHREAD)
-AC_SUBST(CFLAGSTHREADS)
+AC_SUBST(THREAD_CFLAGS)
HAVETHREADS=0
-CFLAGSTHREADS=""
+THREAD_CFLAGS=""
LIBTHREAD=""
dnl
dnl ------ GNU threads
AC_CHECK_HEADERS(pth.h)
if test "$ac_cv_header_pth_h" = "yes"; then
LIBTHREAD="-lpth"
- CFLAGSTHREADS="-DYAZ_GNU_THREADS=1"
+ THREAD_CFLAGS="-DYAZ_GNU_THREADS=1"
HAVETHREADS=1
fi
fi
- LIBS=$OLIBS
+ LIBS="$OLIBS $LIBTHREAD"
fi
dnl
dnl ------ POSIX Threads
if test "$thread_ok" = "yes"; then
AC_MSG_RESULT(yes)
LIBTHREAD="-lpthread"
- CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+ THREAD_CFLAGS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
HAVETHREADS=1
else
CC="$CC -pthread"
thread_ok=yes,thread_ok=no)
if test "$thread_ok" = "yes"; then
AC_MSG_RESULT([yes,BSD])
- CFLAGSTHREADS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+ THREAD_CFLAGS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT"
LIBTHREAD="-pthread"
HAVETHREADS=1
fi
AC_MSG_RESULT(no)
fi
CC=$OCC
- LIBS=$OLIBS
+ LIBS="$OLIBS $LIBTHREAD"
fi
-AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
dnl
dnl ----- libXML2
AC_SUBST(XML2_LIBS)
AC_DEFINE(HAVE_XML2)
else
AC_MSG_RESULT([Not found])
- if test "$xml2dir" != "default"; then
- AC_MSG_ERROR([libXML2 development libraries missing])
+ if test "$xml2dir" = "default"; then
+ AC_MSG_WARN([Libxml2 development libraries not found.])
+ AC_MSG_WARN([YAZ will NOT support SRW/SRU.])
+ else
+ AC_MSG_ERROR([libXML2 development libraries not found.])
fi
fi
fi
doc/Makefile
doc/yaz.xml
doc/yazhtml.dsl
-doc/yazphp.dsl
doc/yazprint.dsl
doc/tkl.xsl
doc/yazhtml.xsl