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
Add OID for External XMLES too
[yaz-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
901096b
..
0d0f1c3
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,8
+1,8
@@
-dnl YAZ Toolkit, Index Data 1994-2004
+dnl YAZ Toolkit, Index Data 1994-2005
dnl See the file LICENSE for details.
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.154 2004-10-01 13:05:09 adam Exp $
+dnl $Id: configure.in,v 1.183 2005-06-23 13:09:42 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.26)
+AM_INIT_AUTOMAKE(yaz, 2.1.9)
AM_MAINTAINER_MODE
dnl
AC_SUBST(READLINE_LIBS)
AM_MAINTAINER_MODE
dnl
AC_SUBST(READLINE_LIBS)
@@
-19,6
+19,16
@@
AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
dnl
YAZ_DOC
dnl
dnl
YAZ_DOC
dnl
+dnl
+dnl ------ Headers
+AC_CHECK_HEADERS(dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h sys/poll.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)
dnl ----- Sockets
checkBoth=0
AC_CHECK_FUNC(connect)
@@
-30,12
+40,12
@@
if test "$checkBoth" = "1"; then
LIBS="$LIBS -lsocket -lnsl"
AC_CHECK_FUNC(accept, , [LIBS=$oldLibs])
fi
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
dnl
dnl ------ OpenSSL
+AC_SUBST(SSL_CFLAGS)
openssl=no
AC_ARG_WITH(openssl, [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
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
SSL_CFLAGS=""
SSL_LIBPATH=""
if test "$openssl" != "no"; then
@@
-79,12
+89,15
@@
if test "$openssl" != "no"; then
fi
CPPFLAGS="$xCPPFLAGS"
fi
fi
CPPFLAGS="$xCPPFLAGS"
fi
+ AC_MSG_CHECKING([for SSL])
if test "$sslver" != "no"; then
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
fi
- AC_MSG_CHECKING([for SSL])
- AC_MSG_RESULT($sslver)
fi
dnl
dnl ------ GNU Readline
fi
dnl
dnl ------ GNU Readline
@@
-147,7
+160,7
@@
if test "$with_iconv" != "no"; then
])
fi
dnl ------ various functions
])
fi
dnl ------ various functions
-AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r)
+AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r usleep fopen64)
if test "$ac_cv_func_poll" = "yes"; then
AC_CHECK_HEADERS(sys/poll.h)
fi
if test "$ac_cv_func_poll" = "yes"; then
AC_CHECK_HEADERS(sys/poll.h)
fi
@@
-200,10
+213,11
@@
extern int accept(int, struct sockaddr *, size_t t *);
])
AC_MSG_RESULT($ac_cv_check_socklen_t)
AC_DEFINE_UNQUOTED(YAZ_SOCKLEN_T,$ac_cv_check_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])
dnl
dnl ------ tcpd
AC_ARG_ENABLE(tcpd,[ --enable-tcpd[=PREFIX] enable TCP wrapper for server if available])
-if test "$enable_tcpd" != "" && test "$enable_tcpd" != "no"; then
+if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
oldLibs=$LIBS
oldCPPFLAGS=$CPPFLAGS
if test "$enable_tcpd" != "yes"; then
oldLibs=$LIBS
oldCPPFLAGS=$CPPFLAGS
if test "$enable_tcpd" != "yes"; then
@@
-221,6
+235,7
@@
if test "$enable_tcpd" != "" && test "$enable_tcpd" != "no"; then
tcpd_ok=1, tcpd_ok=0)
if test "$tcpd_ok" = "0"; then
AC_MSG_RESULT(no)
tcpd_ok=1, tcpd_ok=0)
if test "$tcpd_ok" = "0"; then
AC_MSG_RESULT(no)
+ AC_MSG_ERROR([tcpd development libraries missing])
LIBS=$oldLibs
CPPFLAGS=$oldCPPFLAGS
else
LIBS=$oldLibs
CPPFLAGS=$oldCPPFLAGS
else
@@
-229,13
+244,6
@@
if test "$enable_tcpd" != "" && test "$enable_tcpd" != "no"; then
fi
fi
dnl
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)
HAVETHREADS=0
AC_SUBST(LIBTHREAD)
AC_SUBST(CFLAGSTHREADS)
HAVETHREADS=0
@@
-303,9
+311,9
@@
dnl
dnl ----- libXML2
AC_SUBST(XML2_LIBS)
AC_SUBST(XML2_CFLAGS)
dnl ----- libXML2
AC_SUBST(XML2_LIBS)
AC_SUBST(XML2_CFLAGS)
-xml2dir=yes
+xml2dir=default
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
+if test "$xml2dir" = "yes" -o "$xml2dir" = "default"; then
for d in /usr /usr/local; do
if test -x $d/bin/xml2-config; then
xml2dir=$d
for d in /usr /usr/local; do
if test -x $d/bin/xml2-config; then
xml2dir=$d
@@
-322,7
+330,13
@@
if test "$xml2dir" != "no"; then
AC_MSG_RESULT($XML2_VER)
AC_DEFINE(HAVE_XML2)
else
AC_MSG_RESULT($XML2_VER)
AC_DEFINE(HAVE_XML2)
else
- AC_MSG_RESULT(Not found)
+ AC_MSG_RESULT([Not found])
+ 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
dnl
fi
fi
dnl
@@
-362,4
+376,5
@@
doc/tkl.xsl
doc/yazhtml.xsl
etc/Makefile
yaz-config
doc/yazhtml.xsl
etc/Makefile
yaz-config
+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])