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
Treat field as having subfields even if first char is blank/other
[yaz-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
1d53a51
..
ad8bb64
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,8
+1,8
@@
dnl YAZ Toolkit, Index Data 1994-2004
dnl See the file LICENSE for details.
dnl YAZ Toolkit, Index Data 1994-2004
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.155 2004-10-01 23:01:26 adam Exp $
+dnl $Id: configure.in,v 1.161 2004-11-10 09:26:43 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.0.29)
AM_MAINTAINER_MODE
dnl
AC_SUBST(READLINE_LIBS)
AM_MAINTAINER_MODE
dnl
AC_SUBST(READLINE_LIBS)
@@
-33,9
+33,9
@@
fi
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
dnl
dnl ------ OpenSSL
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
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
+79,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
@@
-366,4
+369,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])