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
Fixed bug #172: RPM builds does not enable SSL.
[yaz-moved-to-github.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
2d54f3f
..
9062693
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.150 2004-09-09 09:53:08 adam Exp $
+dnl $Id: configure.in,v 1.157 2004-10-09 08:03:26 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.23)
+AM_INIT_AUTOMAKE(yaz, 2.0.26)
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,14
@@
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])
fi
fi
- AC_MSG_CHECKING([for SSL])
- AC_MSG_RESULT($sslver)
fi
dnl
dnl ------ GNU Readline
fi
dnl
dnl ------ GNU Readline
@@
-103,20
+105,14
@@
if test "$ac_cv_lib_readline_readline" = "yes"; then
#include <stdio.h>
#include <readline/readline.h>
],[
#include <stdio.h>
#include <readline/readline.h>
],[
- static void f()
- {
rl_attempted_completion_over = 0;
rl_attempted_completion_over = 0;
- }
],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER))
AC_TRY_LINK([
#include <stdio.h>
#include <readline/readline.h>
],[
],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER))
AC_TRY_LINK([
#include <stdio.h>
#include <readline/readline.h>
],[
- static void f()
- {
rl_completion_matches (0, 0);
rl_completion_matches (0, 0);
- }
- ],AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES))
+ ],[AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES)])
LIBS=$xLIBS
fi
dnl ------ iconv
LIBS=$xLIBS
fi
dnl ------ iconv
@@
-132,7
+128,7
@@
if test "$with_iconv" != "no"; then
AC_TRY_LINK([
#include <iconv.h>
],[
AC_TRY_LINK([
#include <iconv.h>
],[
- static void f() {iconv_t t = iconv_open("", ""); }
+ iconv_t t = iconv_open("", "");
],[
AC_DEFINE(HAVE_ICONV_H)
AC_MSG_RESULT(yes)
],[
AC_DEFINE(HAVE_ICONV_H)
AC_MSG_RESULT(yes)
@@
-141,7
+137,7
@@
if test "$with_iconv" != "no"; then
AC_TRY_LINK([
#include <iconv.h>
],[
AC_TRY_LINK([
#include <iconv.h>
],[
- static void f() {iconv_t t = iconv_open("", ""); }
+ iconv_t t = iconv_open("", "");
],[
AC_DEFINE(HAVE_ICONV_H)
AC_MSG_RESULT(yes)
],[
AC_DEFINE(HAVE_ICONV_H)
AC_MSG_RESULT(yes)
@@
-209,7
+205,7
@@
AC_DEFINE_UNQUOTED(YAZ_SOCKLEN_T,$ac_cv_check_socklen_t)
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
@@
-227,6
+223,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
@@
-309,9
+306,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
@@
-328,7
+325,10
@@
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_ERROR([libXML2 development libraries missing])
+ fi
fi
fi
dnl
fi
fi
dnl
@@
-368,4
+368,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])