X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=b5d28f6aaa4a1fe3b0fb70a7f0278d9d5f071c17;hp=d77a7de715d5e0918ae4c4a50f462b16a90ee385;hb=725db3d87d84a1072939d74a537454a5d4e1e0cc;hpb=a1e8950b3ac76b9b8a85d9261b07c558ad8a3c9b

diff --git a/configure.in b/configure.in
index d77a7de..b5d28f6 100644
--- 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 $Id: configure.in,v 1.124 2004-02-05 11:55:56 adam Exp $
+dnl $Id: configure.in,v 1.176 2005-04-26 18:46:42 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.10)
+AM_INIT_AUTOMAKE(yaz, 2.1.4)
 AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
@@ -15,77 +15,20 @@ test -z "$YACC" && AC_MSG_WARN([GNU bison not found])
 AC_PROG_INSTALL
 AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
-AC_PATH_PROG(pkgconfig, pkg-config, NONE)
+AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
 dnl
-dnl ----- DOCBOOK DTD
-AC_SUBST(DTD_DIR)
-AC_ARG_WITH(dtd, [  --with-dtd[=DIR]        use docbookx.dtd in DIR],
-[
-   if test -f "$withval/docbookx.dtd"; then
-      DTD_DIR=$withval
-   fi
-],[
-   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 \
-         /usr/share/sgml/docbook/dtd/xml/4.0 \
-	    /usr/lib/sgml/dtd/docbook-xml 
-   do
-     if test -f $d/docbookx.dtd; then
-       AC_MSG_RESULT($d)
-       DTD_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DTD_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-AC_SUBST(DSSSL_DIR)
-AC_ARG_WITH(dsssl,[  --with-dsssl[=DIR]      use Docbook DSSSL in DIR/{html,print}/docbook.dsl],
-[
-   if test -f "$withval/html/docbook.dsl"; then
-      DSSSL_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for docbook.dsl)
-   for d in /usr/share/sgml/docbook/stylesheet/dsssl/modular \
-            /usr/share/sgml/docbook/dsssl-stylesheets-1.* \
-            /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh 
-   do
-     if test -f $d/html/docbook.dsl; then
-       AC_MSG_RESULT($d)
-       DSSSL_DIR=$d
-       break
-     fi
-   done
-   if test -z "$DSSSL_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
-AC_SUBST(XSL_DIR)
-AC_ARG_WITH(xsl,[  --with-xsl[=DIR]        use Docbook XSL in DIR/{htmlhelp,xhtml}],
-[
-   if test -f "$withval/htmlhelp/htmlhelp.xsl"; then
-      XSL_DIR=$withval
-   fi
-],[
-   AC_MSG_CHECKING(for htmlhelp.xsl)
-   for d in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh \
-            /usr/share/sgml/docbook/xsl-stylesheets-1.* 
-   do
-     if test -f $d/htmlhelp/htmlhelp.xsl; then
-       AC_MSG_RESULT($d)
-       XSL_DIR=$d
-       break
-     fi
-   done
-   if test -z "$XSL_DIR"; then
-      AC_MSG_RESULT(Not found)
-   fi
-])
+YAZ_DOC
 dnl 
+dnl
+dnl ------ Headers
+AC_CHECK_HEADERS(dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h sys/poll.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 ----- Sockets
 checkBoth=0
 AC_CHECK_FUNC(connect)
@@ -97,61 +40,65 @@ if test "$checkBoth" = "1"; then
 	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
-openssl=no
-AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
 AC_SUBST(SSL_CFLAGS)
-AC_SUBST(SSL_LIBS)
-AC_SUBST(SSL_DEFS)
-USE_SSL=0
+openssl=no
+AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX]   OpenSSL library in PREFIX], [openssl=$withval])
 SSL_CFLAGS=""
-SSL_LIBS=""
-SSL_DEFS=""
+SSL_LIBPATH=""
 if test "$openssl" != "no"; then
 	sslver=no
-	xLIBS="$LIBS";
-	xCFLAGS="$CFLAGS";
 	if test "$openssl" != "yes"; then
-		if $openssl/bin/pkg-config --exists openssl; then
-			SSL_CFLAGS=`$openssl/bin/pkgconfig --cflags openssl`
-			SSL_LIBS=`$openssl/bin/pkgconfig --libs openssl`
-			sslver=`$openssl/bin/pkgconfig --modversion openssl`
-		else
+		if test -x $openssl/bin/pkg-config; then
+			if $openssl/bin/pkg-config --exists openssl; then
+				SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
+				LIBS="$LIBS `$openssl/bin/pkg-config --libs openssl`"
+				sslver=`$openssl/bin/pkg-config --modversion openssl`
+			fi
+		fi
+		if test "$sslver" = "no"; then
                 	SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
-                	SSL_LIBS="-L$openssl/lib"
-			CFLAGS="$SSL_CFLAGS $CFLAGS"
-			LIBS="$SSL_LIBS $LIBS"
+                	SSL_LIBPATH="-L$openssl/lib"
 		fi
 	else
-		if $pkgconfig --exists openssl; then
-			SSL_CFLAGS=`$pkgconfig --cflags openssl`
-			SSL_LIBS=`$pkgconfig --libs openssl`
-			sslver=`$pkgconfig --modversion openssl`
-		fi	
+		if test "$pkgconfigpath" != "NONE"; then
+			if $pkgconfigpath --exists openssl; then
+				SSL_CFLAGS=`$pkgconfigpath --cflags openssl`
+				LIBS="$LIBS `$pkgconfigpath --libs openssl`"
+				sslver=`$pkgconfigpath --modversion openssl`
+			fi
+		fi
+		if test "$sslver" = "no"; then
+                	SSL_CFLAGS="-I/usr/include/openssl"
+		fi
 	fi
 	if test "$sslver" = "no"; then
-		AC_CHECK_LIB(crypto, main,[SSL_LIBS="$SSL_LIBS -lcrypto"])
-        	LIBS="$LIBS $SSL_LIBS"
+		xLIBS="$LIBS";
+		xCPPFLAGS="$CPPFLAGS";
+		CPPFLAGS="$CPPFLAGS $SSL_CFLAGS $SSL_LIBPATH"
+		AC_CHECK_LIB(crypto, main)
 		AC_CHECK_LIB(ssl, SSL_new)
 		if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
 			AC_CHECK_HEADER(openssl/ssl.h,[sslver=yes])
+			LIBS="$SSL_LIBPATH $LIBS"
 		fi
-		if test "$sslver" = "yes"; then
-			SSL_LIBS="$SSL_LIBS -lssl"
+		if test "$sslver" != "yes"; then
+			LIBS="$xLIBS"
 		fi
+		CPPFLAGS="$xCPPFLAGS"
 	fi
+	AC_MSG_CHECKING([for SSL])
 	if test "$sslver" != "no"; then
-		SSL_DEFS="-DHAVE_OPENSSL_H=1"
-		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
-	AC_MSG_CHECKING([for SSL])
-	AC_MSG_RESULT($sslver)
-	LIBS="$xLIBS"
-	CFLAGS="$xCFLAGS"
 fi
-AM_CONDITIONAL(ISSSL, test $USE_SSL = "1")
 dnl
 dnl ------ GNU Readline
 READLINE_SHARED_LIBADD=""
@@ -169,24 +116,18 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
 	#include <stdio.h>
 	#include <readline/readline.h>
 	],[
-        static void f()
-        {
                 rl_attempted_completion_over = 0;
-        }
         ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER))
         AC_TRY_LINK([
 	#include <stdio.h>
 	#include <readline/readline.h>
 	],[
-        static void f()
-        {
                 rl_completion_matches (0, 0);
-        }
-        ],AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES))
+        ],[AC_DEFINE(HAVE_READLINE_RL_COMPLETION_MATCHES)])
         LIBS=$xLIBS
 fi
 dnl ------ iconv
-AC_ARG_WITH(iconv, [  --with-iconv[=PREFIX]   iconv library in PREFIX])
+AC_ARG_WITH(iconv, [  --with-iconv[=PREFIX]     iconv library in PREFIX])
 if test "$with_iconv" != "no"; then
         AC_MSG_CHECKING(for iconv)
 	oldLIBS="$LIBS"
@@ -198,7 +139,7 @@ if test "$with_iconv" != "no"; then
         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)
@@ -207,7 +148,7 @@ if test "$with_iconv" != "no"; then
 	        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)
@@ -219,7 +160,7 @@ if test "$with_iconv" != "no"; then
 	])
 fi
 dnl ------ various functions
-AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r)
+AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r usleep)
 if test "$ac_cv_func_poll" = "yes"; then
         AC_CHECK_HEADERS(sys/poll.h)
 fi
@@ -272,10 +213,11 @@ extern int accept(int, struct sockaddr *, size_t t *);
 ])
 AC_MSG_RESULT($ac_cv_check_socklen_t)
 AC_DEFINE_UNQUOTED(YAZ_SOCKLEN_T,$ac_cv_check_socklen_t)
+AC_DEFINE(YAZ_USE_NEW_LOG)
 dnl
 dnl ------ tcpd
 AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
-if test "$enable_tcpd" != ""; then
+if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
 	oldLibs=$LIBS
 	oldCPPFLAGS=$CPPFLAGS
 	if test "$enable_tcpd" != "yes"; then
@@ -293,6 +235,7 @@ if test "$enable_tcpd" != ""; then
 	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
@@ -301,13 +244,6 @@ if test "$enable_tcpd" != ""; then
 	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)
 HAVETHREADS=0
@@ -375,9 +311,9 @@ dnl
 dnl ----- libXML2
 AC_SUBST(XML2_LIBS)
 AC_SUBST(XML2_CFLAGS)
-xml2dir=yes
-AC_ARG_WITH(xml2, [  --with-xml2[=PREFIX]    use libxml2 in PREFIX],[xml2dir=$withval])
-if test "$xml2dir" = "yes"; then
+xml2dir=default
+AC_ARG_WITH(xml2, [  --with-xml2[=PREFIX]      use libxml2 in PREFIX],[xml2dir=$withval])
+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
@@ -394,7 +330,10 @@ if test "$xml2dir" != "no"; then
 		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
@@ -434,4 +373,5 @@ doc/tkl.xsl
 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])