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
Abort when trying to translate a node of unknown type. This happens
[yaz-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
8e0cc7d
..
e05f27a
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.165 2005-01-05 10:23:41 adam Exp $
+dnl $Id: configure.in,v 1.189 2005-12-17 20:20:55 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.31)
+AM_INIT_AUTOMAKE(yaz, 2.1.11)
AM_MAINTAINER_MODE
dnl
AC_SUBST(READLINE_LIBS)
AM_MAINTAINER_MODE
dnl
AC_SUBST(READLINE_LIBS)
@@
-19,6
+19,13
@@
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/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 ----- Types
AC_CHECK_TYPES([long long])
dnl
@@
-33,7
+40,7
@@
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
AC_SUBST(SSL_CFLAGS)
dnl
dnl ------ OpenSSL
AC_SUBST(SSL_CFLAGS)
@@
-153,8
+160,17
@@
if test "$with_iconv" != "no"; then
])
fi
dnl ------ various functions
])
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_CHECK_HEADERS(sys/poll.h)
fi
dnl ------ socklen_t
@@
-237,17
+253,9
@@
if test "$enable_tcpd" -a "$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)
+AC_SUBST(THREAD_CFLAGS)
HAVETHREADS=0
HAVETHREADS=0
-CFLAGSTHREADS=""
+THREAD_CFLAGS=""
LIBTHREAD=""
dnl
dnl ------ GNU threads
LIBTHREAD=""
dnl
dnl ------ GNU threads
@@
-260,11
+268,11
@@
if test "$enable_pth" = "yes"; then
AC_CHECK_HEADERS(pth.h)
if test "$ac_cv_header_pth_h" = "yes"; then
LIBTHREAD="-lpth"
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
HAVETHREADS=1
fi
fi
- LIBS=$OLIBS
+ LIBS="$OLIBS $LIBTHREAD"
fi
dnl
dnl ------ POSIX Threads
fi
dnl
dnl ------ POSIX Threads
@@
-283,7
+291,7
@@
if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
if test "$thread_ok" = "yes"; then
AC_MSG_RESULT(yes)
LIBTHREAD="-lpthread"
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"
HAVETHREADS=1
else
CC="$CC -pthread"
@@
-295,7
+303,7
@@
if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
thread_ok=yes,thread_ok=no)
if test "$thread_ok" = "yes"; then
AC_MSG_RESULT([yes,BSD])
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
LIBTHREAD="-pthread"
HAVETHREADS=1
fi
@@
-304,9
+312,8
@@
if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
AC_MSG_RESULT(no)
fi
CC=$OCC
AC_MSG_RESULT(no)
fi
CC=$OCC
- LIBS=$OLIBS
+ LIBS="$OLIBS $LIBTHREAD"
fi
fi
-AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
dnl
dnl ----- libXML2
AC_SUBST(XML2_LIBS)
dnl
dnl ----- libXML2
AC_SUBST(XML2_LIBS)
@@
-331,8
+338,11
@@
if test "$xml2dir" != "no"; then
AC_DEFINE(HAVE_XML2)
else
AC_MSG_RESULT([Not found])
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
fi
fi
fi
@@
-367,7
+377,6
@@
zoom/Makefile
doc/Makefile
doc/yaz.xml
doc/yazhtml.dsl
doc/Makefile
doc/yaz.xml
doc/yazhtml.dsl
-doc/yazphp.dsl
doc/yazprint.dsl
doc/tkl.xsl
doc/yazhtml.xsl
doc/yazprint.dsl
doc/tkl.xsl
doc/yazhtml.xsl