dnl YAZ Toolkit, Index Data 1995-2007
dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.73 2007-04-12 13:53:33 adam Exp $
+dnl $Id: configure.ac,v 1.90 2007-08-22 09:09:03 adam Exp $
AC_PREREQ(2.59)
-AC_INIT([yaz],[2.1.99.2],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[3.0.10],[yaz-help@indexdata.dk])
AC_CONFIG_SRCDIR(configure.ac)
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([1.8])
ZIFFY_PROG=
AC_ARG_WITH(pcap, [ --with-pcap[=DIR] libpcap root dir located in (dir)], [PCAP_DIR="$withval"],[PCAP_DIR=default])
-AC_MSG_CHECKING([for libpcap (required for ziffy)])
if test "${PCAP_DIR}" != "no"; then
if test "${ac_cv_header_netinet_if_ether_h}" = "no"; then
:
elif test "${PCAP_DIR}" != "yes" && test "${PCAP_DIR}" != "default"; then
- if test -r $PCAP_DIR/libpcap.a && test -r $PCAP_DIR/pcap.h; then
- PCAP_DIR="$PCAP_DIR"
- PCAP_LIBS="${LIBS} -L$PCAP_DIR -lpcap"
- PCAP_CFLAGS="${INCS} -I$PCAP_DIR"
- ZIFFY_PROG=ziffy
+ PCAP_LIBS="-lpcap"
+ if test "$PCAP_DIR" != "/usr"; then
+ PCAP_LIBS="-L$PCAP_DIR $PCAP_LIBS"
+ PCAP_CFLAGS="-I$PCAP_DIR"
+ fi
+ else
+ oldLibs=$LIBS
+ AC_CHECK_LIB([pcap], [main])
+ if test "$ac_cv_lib_pcap_main" = "yes"; then
+ AC_CHECK_HEADER([pcap.h])
+ if test "$ac_cv_header_pcap_h" = "yes"; then
+ PCAP_LIBS="-lpcap"
+ fi
fi
- elif test -d /usr/local &&
- test -r /usr/local/lib/libpcap.a &&
- test -r /usr/local/include/pcap.h; then
- PCAP_DIR="/usr/local"
- PCAP_LIBS="${LIBS} -L$PCAP_DIR/lib -lpcap"
- PCAP_CFLAGS="${INCS} -I$PCAP_DIR/include"
- ZIFFY_PROG=ziffy
- elif test -d /usr &&
- test -r /usr/lib/libpcap.a &&
- test -r /usr/include/pcap.h; then
- PCAP_DIR="/usr"
- PCAP_LIBS="${LIBS} -lpcap"
- ZIFFY_PROG=ziffy
+ LIBS=$oldLibs
fi
fi
-if test -z "$ZIFFY_PROG"; then
+AC_MSG_CHECKING([for libpcap (required for ziffy)])
+if test -z "${PCAP_LIBS}"; then
AC_MSG_RESULT([not found. ziffy disabled])
- if test "${PCAP_DIR}" != "default" && test "${PCAP_DIR}" != "no"; then
+ if test "${PCAP_DIR}" = "yes"; then
AC_MSG_ERROR([libpcap missing])
fi
else
AC_MSG_RESULT([found in $PCAP_DIR])
+ ZIFFY_PROG=ziffy
fi
dnl ------ various functions
CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
fi
AC_MSG_CHECKING(for working tcpd.h)
- LIBS="$LIBS -lwrap -lnsl"
+ LIBS="$LIBS -lwrap"
AC_TRY_LINK([#include <syslog.h>
#include <tcpd.h>
int allow_severity = LOG_INFO;
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([
+ OCFLAGS=$CFLAGS
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- AC_DEFINE(YAZ_POSIX_THREADS)
dnl unfortunately empty thread lib spec is problematic because
dnl 'yaz-config --cflags' is not always passed to linker in
dnl applications using YAZ (such as Zebra).
done
LIBS=$OLIBS
fi
- LIBS="$PTHREAD_LIBS $LIBS"
- YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS $PTHREAD_CFLAGS -DYAZ_POSIX_THREADS=1"
+ CFLAGS=$OCFLAGS
+ PTHREAD_CFLAGS="$PTHREAD_CFLAGS -DYAZ_POSIX_THREADS=1"
])
fi
AC_SUBST(YAZ_BUILD_ROOT)
YAZ_SRC_ROOT=`cd ${srcdir}; pwd`
YAZ_BUILD_ROOT=`pwd`
+
+dnl ------ windows version files
+WIN_FILEVERSION=`echo $PACKAGE_VERSION|tr . ,`.1
dnl
dnl ------ Makefiles
dnl
yaz-config
yaz.pc
Doxyfile
-],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])
+],[
+ sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config
+ ]
+)
echo \