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
More debugging tools for yaz_iconv
[yaz-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
55076ad
..
6bea66e
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,8
+1,8
@@
dnl YAZ Toolkit, Index Data 1994-2002
dnl See the file LICENSE for details.
dnl YAZ Toolkit, Index Data 1994-2002
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.91 2002-09-20 22:23:13 adam Exp $
+dnl $Id: configure.in,v 1.98 2002-11-29 15:41:00 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 1.9.1)
+AM_INIT_AUTOMAKE(yaz, 1.9.2)
dnl
AC_SUBST(READLINE_LIBS)
AC_SUBST(YAZ_CONF_CFLAGS)
dnl
AC_SUBST(READLINE_LIBS)
AC_SUBST(YAZ_CONF_CFLAGS)
@@
-23,7
+23,7
@@
AC_ARG_WITH(dtd, [ --with-dtd[=DIR] Use docbookx.dtd in DIR],
],[
AC_MSG_CHECKING(for docbookx.dtd)
for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
],[
AC_MSG_CHECKING(for docbookx.dtd)
for d in /usr/share/sgml/docbook/dtd/xml/4.1.2 \
- /usr/share/sgml/docbook/xml-dtd-4.1.2 \
+ /usr/share/sgml/docbook/xml-dtd-4.1.2* \
/usr/share/sgml/docbook/xml-dtd-4.1 \
/usr/share/sgml/docbook/dtd/xml/4.0 \
/usr/lib/sgml/dtd/docbook-xml
/usr/share/sgml/docbook/xml-dtd-4.1 \
/usr/share/sgml/docbook/dtd/xml/4.0 \
/usr/lib/sgml/dtd/docbook-xml
@@
-47,8
+47,7
@@
AC_ARG_WITH(dsssl,[ --with-dsssl[=DIR] Use DSSSL in DIR/{html,print}/docbo
],[
AC_MSG_CHECKING(for docbook.dsl)
for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
],[
AC_MSG_CHECKING(for docbook.dsl)
for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
- /usr/share/sgml/docbook/dsssl-stylesheets-1.64 \
- /usr/share/sgml/docbook/dsssl-stylesheets-1.59 \
+ /usr/share/sgml/docbook/dsssl-stylesheets-1.* \
/usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh
do
if test -f $d/html/docbook.dsl; then
/usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh
do
if test -f $d/html/docbook.dsl; then
@@
-184,12
+183,24
@@
AC_CACHE_VAL(ac_cv_check_socklen_t,[ac_cv_check_socklen_t=''
AC_TRY_COMPILE([
#include <sys/types.h>
#include <sys/socket.h>
AC_TRY_COMPILE([
#include <sys/types.h>
#include <sys/socket.h>
- extern accept(int, struct sockaddr *, socklen_t *);
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ extern int accept(int, struct sockaddr *, socklen_t *);
+ #ifdef __cplusplus
+ }
+ #endif
],,[ac_cv_check_socklen_t=socklen_t],[
AC_TRY_COMPILE([
#include <sys/types.h>
#include <sys/socket.h>
],,[ac_cv_check_socklen_t=socklen_t],[
AC_TRY_COMPILE([
#include <sys/types.h>
#include <sys/socket.h>
- extern accept(int, struct sockaddr *, size_t t *);
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ extern int accept(int, struct sockaddr *, size_t t *);
+ #ifdef __cplusplus
+ }
+ #endif
],,[ac_cv_check_socklen_t=size_t],[ac_cv_check_socklen_t=int])
])
])
],,[ac_cv_check_socklen_t=size_t],[ac_cv_check_socklen_t=int])
])
])
@@
-309,11
+320,6
@@
AC_SUBST(YAZ_BUILD_ROOT)
YAZ_SRC_ROOT=`cd ${srcdir}; pwd`
YAZ_BUILD_ROOT=`pwd`
dnl
YAZ_SRC_ROOT=`cd ${srcdir}; pwd`
YAZ_BUILD_ROOT=`pwd`
dnl
-if test -f ${srcdir}/lib/yaz-config.in; then
- rm ${srcdir}/lib/yaz-config.in
-fi
-sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz-config.in >${srcdir}/lib/yaz-config.in
-dnl
dnl ------ Makefiles
dnl
AC_OUTPUT([
dnl ------ Makefiles
dnl
AC_OUTPUT([
@@
-326,8
+332,6
@@
ill/Makefile
zutil/Makefile
comstack/Makefile
ccl/Makefile
zutil/Makefile
comstack/Makefile
ccl/Makefile
-tab/Makefile
-retrieval/Makefile
server/Makefile
include/Makefile
include/yaz/Makefile
server/Makefile
include/Makefile
include/yaz/Makefile
@@
-340,6
+344,6
@@
doc/yaz.xml
doc/yazhtml.dsl
doc/yazphp.dsl
doc/yazprint.dsl
doc/yazhtml.dsl
doc/yazphp.dsl
doc/yazprint.dsl
+doc/tkl.xsl
yaz-config
yaz-config
-lib/yaz-config
-],[chmod +x yaz-config lib/yaz-config])
+],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > lib/yaz-config && chmod +x yaz-config lib/yaz-config])