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

diff --git a/configure.in b/configure.in
index d8f16ee..5f5648b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,38 +1,24 @@
-dnl YAZ Toolkit, Index Data 1994-2001
+dnl YAZ Toolkit, Index Data 1994-2004
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.51 2001-10-25 12:00:41 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, 1.8)
+AM_INIT_AUTOMAKE(yaz, 2.0.19)
+AM_MAINTAINER_MODE
 dnl
 AC_SUBST(READLINE_LIBS)
+AC_SUBST(YAZ_CONF_CFLAGS)
 dnl ------ Checking programs
 AC_PROG_CC
 AC_PROG_CPP
+AC_CHECK_PROGS(YACC, 'bison -y')
+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
+YAZ_DOC
 dnl 
-dnl ----- yaz-comp: The Yaz Compiler
-AC_SUBST(EXTRAMODULE)
-AC_SUBST(EXTRALIB)
-
-EXTRAMODULE="z39.50 zutil"
-
-AC_ARG_ENABLE(modules,[  --enable-modules=\"mod ..\" ill],[
-if test "$enable_modules" != "no"; then
-		EXTRAMODULE="$EXTRAMODULE $enable_modules"
-fi
-],[
-EXTRAMODULE="$EXTRAMODULE ill ccl zoom"
-])
-EXTRALIB=""
-for module in $EXTRAMODULE; do
-	EXTRALIB="$EXTRALIB ../$module/lib${module}.la"
-	if test $module = "z39.50"; then
-		module=z3950
-	fi
-	AC_DEFINE_UNQUOTED(YAZ_MODULE_${module})
-done
 dnl ----- Sockets
 checkBoth=0
 AC_CHECK_FUNC(connect)
@@ -46,16 +32,56 @@ 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[=DIR]    OpenSSL library in DIR], [openssl=$withval])
-if test "$openssl" = "yes"; then
-	AC_CHECK_LIB(crypto, main)
-	AC_CHECK_LIB(ssl, SSL_new)
-	if test "$ac_cv_lib_ssl_SSL_new" = "yes"; then
-		AC_CHECK_HEADERS(openssl/ssl.h)
+AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX] OpenSSL library in PREFIX], [openssl=$withval])
+USE_SSL=0
+SSL_CFLAGS=""
+SSL_LIBS=""
+if test "$openssl" != "no"; then
+	sslver=no
+	if test "$openssl" != "yes"; then
+		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
+	if test "$sslver" != "no"; then
+		LIBS="$SSL_LIBS $LIBS"
+		CFLAGS="$CFLAGS -DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
+		USE_SSL=1
+	fi
+	AC_MSG_CHECKING([for SSL])
+	AC_MSG_RESULT($sslver)
 fi
+dnl
 dnl ------ GNU Readline
 READLINE_SHARED_LIBADD=""
 AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
@@ -66,13 +92,119 @@ AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline $READ
 AC_CHECK_LIB(history, add_history, [READLINE_LIBS="$READLINE_LIBS -lhistory"])
 if test "$ac_cv_lib_readline_readline" = "yes"; then
 	AC_CHECK_HEADERS(readline/readline.h readline/history.h)
+        xLIBS=$LIBS
+        LIBS="$LIBS $READLINE_LIBS"
+        AC_TRY_LINK([
+	#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))
+        LIBS=$xLIBS
+fi
+dnl ------ iconv
+AC_ARG_WITH(iconv, [  --with-iconv[=PREFIX]   iconv library in PREFIX])
+if test "$with_iconv" != "no"; then
+        AC_MSG_CHECKING(for iconv)
+	oldLIBS="$LIBS"
+       	oldCPPFLAGS="${CPPFLAGS}"
+	if test "$with_iconv" != "yes" -a "$with_iconv" != ""; then
+	        LIBS="$LIBS -L${with_iconv}/lib"
+       		CPPFLAGS="${CPPFLAGS} -I${with_iconv}/include"
+	fi
+        AC_TRY_LINK([
+		#include <iconv.h>
+	],[
+		static void f() {iconv_t t = iconv_open("", ""); }
+	],[
+		AC_DEFINE(HAVE_ICONV_H)
+		AC_MSG_RESULT(yes)
+	],[
+	        LIBS="$LIBS -liconv"
+	        AC_TRY_LINK([
+			#include <iconv.h>
+		],[
+			static void f() {iconv_t t = iconv_open("", ""); }
+		],[
+			AC_DEFINE(HAVE_ICONV_H)
+			AC_MSG_RESULT(yes)
+		],[
+			LIBS="$oldLIBS"
+			CPPFLAGS="$oldCPPFLAGS"
+			AC_MSG_RESULT(no)
+		])
+	])
+fi
+dnl ------ various functions
+AC_CHECK_FUNCS(vsnprintf gettimeofday poll strerror_r)
+if test "$ac_cv_func_poll" = "yes"; then
+        AC_CHECK_HEADERS(sys/poll.h)
 fi
-dnl ------ snprintf
-AC_CHECK_FUNCS(vsnprintf gettimeofday)
+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
+#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
+#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_MSG_RESULT($ac_cv_check_socklen_t)
+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
@@ -99,6 +231,7 @@ if test "$enable_tcpd" != ""; then
 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)
@@ -110,6 +243,7 @@ HAVETHREADS=0
 CFLAGSTHREADS=""
 LIBTHREAD=""
 dnl
+dnl ------ GNU threads
 AC_ARG_ENABLE(pth, [  --enable-pth            enable GNU threads],[enable_pth=$enableval],[enable_pth=no])
 AC_SUBST(LIBPTH)
 if test "$enable_pth" = "yes"; then
@@ -141,7 +275,7 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 		thread_ok=yes,thread_ok=no)
 	if test "$thread_ok" = "yes"; then
 		AC_MSG_RESULT(yes)
-		LIBTHREAD=-lpthread
+		LIBTHREAD="-lpthread"
 		CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
 		HAVETHREADS=1
 	else
@@ -155,6 +289,7 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 		if test "$thread_ok" = "yes"; then
 			AC_MSG_RESULT([yes,BSD])
 			CFLAGSTHREADS="-pthread -DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+			LIBTHREAD="-pthread"
 			HAVETHREADS=1
 		fi
 	fi
@@ -165,40 +300,67 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 	LIBS=$OLIBS
 fi
 AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
+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
+	for d in /usr /usr/local; do
+		if test -x $d/bin/xml2-config; then
+			xml2dir=$d
+		fi
+	done
+fi
+if test "$xml2dir" != "no"; then
+	AC_MSG_CHECKING(for libXML2)
+	if test -x $xml2dir/bin/xml2-config; then
+		XML2_LIBS=`$xml2dir/bin/xml2-config --libs`
+		LIBS="$XML2_LIBS $LIBS"
+		XML2_CFLAGS=`$xml2dir/bin/xml2-config --cflags`
+		XML2_VER=`$xml2dir/bin/xml2-config --version`
+		AC_MSG_RESULT($XML2_VER)
+		AC_DEFINE(HAVE_XML2)
+	else
+		AC_MSG_RESULT(Not found)
+	fi
+fi
+dnl
+dnl ------ Memory debugging
+AC_ARG_ENABLE(memdebug, [  --enable-memdebug       enable memory debugging],[enable_memdebug=$enableval],[enable_memdebug=none])
+if test "$enable_memdebug" = "yes"; then
+	AC_DEFINE(TRACE_XMALLOC,2)
+elif test "$enable_memdebug" = "no"; then
+	AC_DEFINE(TRACE_XMALLOC,0)
+fi
+dnl
 dnl ------ Using this for "in-source" yaz-config
 AC_SUBST(YAZ_SRC_ROOT)
 AC_SUBST(YAZ_BUILD_ROOT)
 YAZ_SRC_ROOT=`cd ${srcdir}; pwd`
 YAZ_BUILD_ROOT=`pwd`
 dnl
-if test -f ${srcdir}/lib/yaz-config.in; then
-	rm ${srcdir}/lib/yaz-config.in
-fi
-sed s%yaz_echo_source=yes%yaz_echo_source=no%g < ${srcdir}/yaz-config.in >${srcdir}/lib/yaz-config.in
-dnl
-SUBDIRS_VAR="util odr comstack $EXTRAMODULE tab retrieval server include lib include client ztest"
-AC_SUBST(SUBDIRS_VAR)
 dnl ------ Makefiles
 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
-tab/Makefile
-retrieval/Makefile
-server/Makefile
 include/Makefile
 include/yaz/Makefile
-lib/Makefile
-zoom/Makefile
 client/Makefile
 ztest/Makefile
+zoom/Makefile
 doc/Makefile
+doc/yaz.xml
+doc/yazhtml.dsl
+doc/yazphp.dsl
+doc/yazprint.dsl
+doc/tkl.xsl
+doc/yazhtml.xsl
+etc/Makefile
 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])