X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=5f5648b6262ffde5d167cfdefe8fb3ac74c7fb5e;hp=eb99f9ce9b52e87b8caf169b2dcbef48a0f3d44b;hb=e23eae6ada71a70849bcdab7ee179579aad248e1;hpb=712226031c16536696c809523899e163471c6256

diff --git a/configure.in b/configure.in
index eb99f9c..5f5648b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,9 @@
-dnl YAZ Toolkit, Index Data 1994-2003
+dnl YAZ Toolkit, Index Data 1994-2004
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.110 2003-03-25 09:57:26 adam Exp $
+dnl $Id: configure.in,v 1.139 2004-05-01 23:32:20 adam Exp $
 AC_INIT(include/yaz/yaz-version.h)
-AM_INIT_AUTOMAKE(yaz, 2.0.1)
+AM_INIT_AUTOMAKE(yaz, 2.0.19)
+AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
 AC_SUBST(YAZ_CONF_CFLAGS)
@@ -14,75 +15,9 @@ 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)
 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 ----- Sockets
 checkBoth=0
@@ -97,38 +32,55 @@ if test "$checkBoth" = "1"; then
 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)
-AC_SUBST(SSL_LIBS)
-AC_SUBST(SSL_DEFS)
 USE_SSL=0
 SSL_CFLAGS=""
 SSL_LIBS=""
-SSL_DEFS=""
 if test "$openssl" != "no"; then
-	xLIBS="$LIBS";
-	xCFLAGS="$CFLAGS";
+	sslver=no
 	if test "$openssl" != "yes"; then
-                SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
-                SSL_LIBS="-L$openssl/lib"
-		CFLAGS="$SSL_CFLAGS $CFLAGS"
+		if $openssl/bin/pkg-config --exists openssl; then
+			SSL_CFLAGS=`$openssl/bin/pkg-config --cflags openssl`
+			SSL_LIBS=`$openssl/bin/pkg-config --libs openssl`
+			sslver=`$openssl/bin/pkg-config --modversion openssl`
+		else
+                	SSL_CFLAGS="-I$openssl/include -I$openssl/include/openssl"
+                	SSL_LIBS="-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	
+	fi
+	if test "$sslver" = "no"; then
+		xLIBS="$LIBS";
+		xCFLAGS="$CFLAGS";
+		CFLAGS="$CFLAGS $SSL_CFLAGS"
 		LIBS="$SSL_LIBS $LIBS"
+		AC_CHECK_LIB(crypto, main,[SSL_LIBS="$SSL_LIBS -lcrypto"])
+        	LIBS="$LIBS $SSL_LIBS"
+		AC_CHECK_LIB(ssl, SSL_new)
+		if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
+			AC_CHECK_HEADER(openssl/ssl.h,[sslver=yes])
+		fi
+		if test "$sslver" = "yes"; then
+			SSL_LIBS="-lssl $SSL_LIBS"
+		fi
+		LIBS="$xLIBS"
+		CFLAGS="$xCFLAGS"
 	fi
-	AC_CHECK_LIB(crypto, main,[SSL_LIBS="$SSL_LIBS -lcrypto"])
-        LIBS="$LIBS $SSL_LIBS"
-	AC_CHECK_LIB(ssl, SSL_new)
-	if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
-                SSL_LIBS="$SSL_LIBS -lssl"
-		AC_CHECK_HEADER(openssl/ssl.h,[SSL_DEFS="-DHAVE_OPENSSL_SSL_H=1"; USE_SSL=1])
-        else
-                SSL_LIBS=""
+	if test "$sslver" != "no"; then
+		LIBS="$SSL_LIBS $LIBS"
+		CFLAGS="$CFLAGS -DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
+		USE_SSL=1
 	fi
-	LIBS="$xLIBS"
-	CFLAGS="$xCFLAGS"
+	AC_MSG_CHECKING([for SSL])
+	AC_MSG_RESULT($sslver)
 fi
-AM_CONDITIONAL(ISSSL, test $USE_SSL = "1")
 dnl
 dnl ------ GNU Readline
 READLINE_SHARED_LIBADD=""
@@ -201,29 +153,49 @@ if test "$ac_cv_func_poll" = "yes"; then
         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([
-	#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([
-		#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])
 	])
 ])
@@ -232,7 +204,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])
-if test "$enable_tcpd" != ""; then
+if test "$enable_tcpd" != "" && test "$enable_tcpd" != "no"; then
 	oldLibs=$LIBS
 	oldCPPFLAGS=$CPPFLAGS
 	if test "$enable_tcpd" != "yes"; then
@@ -374,18 +346,11 @@ dnl
 AC_OUTPUT([
 Makefile
 yaz.spec
+src/Makefile
+test/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
-lib/Makefile
 client/Makefile
 ztest/Makefile
 zoom/Makefile
@@ -398,4 +363,4 @@ doc/tkl.xsl
 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])