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
Describe encoding of string attribute-values
[yaz-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
73067f6
..
9dda795
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,8
+1,9
@@
dnl YAZ Toolkit, Index Data 1994-2003
dnl See the file LICENSE for details.
dnl YAZ Toolkit, Index Data 1994-2003
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.109 2003-02-23 21:18:04 adam Exp $
+dnl $Id: configure.in,v 1.117 2003-10-27 12:21:21 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0)
+AM_INIT_AUTOMAKE(yaz, 2.0.5)
+AM_MAINTAINER_MODE
dnl
AC_SUBST(READLINE_LIBS)
AC_SUBST(YAZ_CONF_CFLAGS)
dnl
AC_SUBST(READLINE_LIBS)
AC_SUBST(YAZ_CONF_CFLAGS)
@@
-97,7
+98,7
@@
if test "$checkBoth" = "1"; then
fi
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
dnl
fi
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
dnl
-dnl ------ Open SSL
+dnl ------ OpenSSL
openssl=no
AC_ARG_WITH(openssl, [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
AC_SUBST(SSL_CFLAGS)
openssl=no
AC_ARG_WITH(openssl, [ --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
AC_SUBST(SSL_CFLAGS)
@@
-201,29
+202,49
@@
if test "$ac_cv_func_poll" = "yes"; then
AC_CHECK_HEADERS(sys/poll.h)
fi
dnl ------ socklen_t
AC_CHECK_HEADERS(sys/poll.h)
fi
dnl ------ socklen_t
+dnl We check for socklen_t by making prototypes with the
+dnl various types. First socklen_t, then size_t, finally int.
+dnl If the prototype succeeds, we're probably safe.
+dnl That works if accept is not preprocessor defined (such sa AIX)
AC_MSG_CHECKING([for socklen_t])
AC_CACHE_VAL(ac_cv_check_socklen_t,[ac_cv_check_socklen_t=''
AC_TRY_COMPILE([
AC_MSG_CHECKING([for socklen_t])
AC_CACHE_VAL(ac_cv_check_socklen_t,[ac_cv_check_socklen_t=''
AC_TRY_COMPILE([
- #include <sys/types.h>
- #include <sys/socket.h>
- #ifdef __cplusplus
- extern "C" {
- #endif
- extern int accept(int, struct sockaddr *, socklen_t *);
- #ifdef __cplusplus
- }
- #endif
+#include <sys/types.h>
+#include <sys/socket.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define try 1
+#ifdef AIX
+#if AIX >= 51
+#define try 0
+#endif
+#endif
+#if try
+extern int accept(int, struct sockaddr *, socklen_t *);
+#endif
+#ifdef __cplusplus
+}
+#endif
],,[ac_cv_check_socklen_t=socklen_t],[
AC_TRY_COMPILE([
],,[ac_cv_check_socklen_t=socklen_t],[
AC_TRY_COMPILE([
- #include <sys/types.h>
- #include <sys/socket.h>
- #ifdef __cplusplus
- extern "C" {
- #endif
- extern int accept(int, struct sockaddr *, size_t t *);
- #ifdef __cplusplus
- }
- #endif
+#include <sys/types.h>
+#include <sys/socket.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define try 1
+#ifdef AIX
+#if AIX >= 42
+#define try 0
+#endif
+#endif
+#if try
+extern int accept(int, struct sockaddr *, size_t t *);
+#endif
+#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])
])
])
@@
-374,18
+395,11
@@
dnl
AC_OUTPUT([
Makefile
yaz.spec
AC_OUTPUT([
Makefile
yaz.spec
+src/Makefile
+test/Makefile
util/Makefile
util/Makefile
-odr/Makefile
-z39.50/Makefile
-ill/Makefile
-zutil/Makefile
-comstack/Makefile
-ccl/Makefile
-cql/Makefile
-server/Makefile
include/Makefile
include/yaz/Makefile
include/Makefile
include/yaz/Makefile
-lib/Makefile
client/Makefile
ztest/Makefile
zoom/Makefile
client/Makefile
ztest/Makefile
zoom/Makefile
@@
-398,4
+412,4
@@
doc/tkl.xsl
doc/yazhtml.xsl
etc/Makefile
yaz-config
doc/yazhtml.xsl
etc/Makefile
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])
+],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])