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

diff --git a/configure.in b/configure.in
index 7db122a..b5d28f6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,42 +1,33 @@
-dnl YAZ Toolkit
-dnl (c) Index Data 1994-2000
+dnl YAZ Toolkit, Index Data 1994-2005
 dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.19 2000-03-01 11:06:09 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, 1.6)
+AM_INIT_AUTOMAKE(yaz, 2.1.4)
+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
-AC_PROG_RANLIB
-AC_CHECK_PROGS(have_sgml2txt,sgml2txt)
-AC_CHECK_PROGS(have_sgml2latex,sgml2latex)
-AC_CHECK_PROGS(have_sgml2html,sgml2html)
-if test "$have_sgml2txt" = "no" -o "$have_sgml2latex" = "no" - "$have_sgml2html" = "no"; then
-	DOCMODULE=""
-else
-	DOCMODULE="doc"
-fi
+AM_DISABLE_SHARED
+AM_PROG_LIBTOOL
+AC_PATH_PROG(pkgconfigpath, pkg-config, NONE)
+dnl
+YAZ_DOC
 dnl 
-dnl ----- YC: The Yaz Compiler
-AC_SUBST(ASNMODULE)
-AC_SUBST(ILLMODULE)
-AC_SUBST(ILLLIB)
-AC_ARG_ENABLE(yc,[  --disable-yc            use old encoders, i.e. disable YAZ ASN.1 Compiler], , enable_yc=yes)
-if test "$enable_yc" = "yes"; then
-	ASNMODULE="z39.50"
-	ILLMODULE="ill"
-	ILLLIB=../ill/libill.a
-	ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
-	cp -f include/yaz/z-proto.h include/yaz/proto.h
-else
-	ILLMODULE=""
-	ASNMODULE=asn
-	ILLLIB=""
-	ASN_MAKEFILES="asn/Makefile"
-	cp -f include/yaz/prt-proto.h include/yaz/proto.h
+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
@@ -49,59 +40,338 @@ 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 ------ GNU Readline
-AC_CHECK_LIB(readline, readline, [LIBS="$LIBS -lreadline"])
-if test "$ac_cv_lib_readline_readline" = "no"; then
-	AC_CHECK_LIB(readline, readline, [LIBS="$LIBS -lreadline -ltermcap"])
+dnl ------ OpenSSL
+AC_SUBST(SSL_CFLAGS)
+openssl=no
+AC_ARG_WITH(openssl, [  --with-openssl[=PREFIX]   OpenSSL library in PREFIX], [openssl=$withval])
+SSL_CFLAGS=""
+SSL_LIBPATH=""
+if test "$openssl" != "no"; then
+	sslver=no
+	if test "$openssl" != "yes"; then
+		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_LIBPATH="-L$openssl/lib"
+		fi
+	else
+		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
+		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
+			LIBS="$xLIBS"
+		fi
+		CPPFLAGS="$xCPPFLAGS"
+	fi
+	AC_MSG_CHECKING([for SSL])
+	if test "$sslver" != "no"; then
+		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_CHECK_LIB(history, add_history, [LIBS="$LIBS -lhistory"])
+dnl
+dnl ------ GNU Readline
+READLINE_SHARED_LIBADD=""
+AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"],
+	AC_CHECK_LIB(termcap, tgetent, [READLINE_SHARED_LIBADD="-ltermcap"])
+)
+READLINE_LIBS=""
+AC_CHECK_LIB(readline, readline, [READLINE_LIBS="$READLINE_LIBS -lreadline $READLINE_SHARED_LIBADD"],,$READLINE_SHARED_LIBADD)
+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>
+	],[
+                rl_attempted_completion_over = 0;
+        ],AC_DEFINE(HAVE_READLINE_COMPLETION_OVER))
+        AC_TRY_LINK([
+	#include <stdio.h>
+	#include <readline/readline.h>
+	],[
+                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>
+	],[
+		iconv_t t = iconv_open("", "");
+	],[
+		AC_DEFINE(HAVE_ICONV_H)
+		AC_MSG_RESULT(yes)
+	],[
+	        LIBS="$LIBS -liconv"
+	        AC_TRY_LINK([
+			#include <iconv.h>
+		],[
+			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 usleep)
+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
+#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)
+AC_DEFINE(YAZ_USE_NEW_LOG)
 dnl
 dnl ------ tcpd
-AC_ARG_ENABLE(tcpd,[  --enable-tcpd           enable TCP wrapper for server if available])
-if test "$enable_tcpd" = "yes"; then
-	AC_MSG_CHECKING(for working tcpd.h)
+AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
+if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
 	oldLibs=$LIBS
+	oldCPPFLAGS=$CPPFLAGS
+	if test "$enable_tcpd" != "yes"; then
+		LIBS="$LIBS -L$enable_tcpd/lib"
+		CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
+	fi
+	AC_MSG_CHECKING(for working tcpd.h)
 	LIBS="$LIBS -lwrap -lnsl"
 	AC_TRY_LINK([#include <syslog.h>
-	#include <tcpd.h>
+#include <tcpd.h>
 	int allow_severity = LOG_INFO;
 	int deny_severity = LOG_WARNING;],
 	[struct request_info request_info; int i;
-	i = hosts_access(&request_info);],tcpd_ok=1, tcpd_ok=0)
+	i = hosts_access(&request_info);],
+	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
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(HAVE_TCPD_H)
 	fi
 fi
 dnl
-dnl ------ Headers
-AC_STDC_HEADERS
-if test "$ac_cv_header_stdc" = "no"; then
-	AC_MSG_WARN(Your system doesn't seem to support ANSI C)
+AC_SUBST(LIBTHREAD)
+AC_SUBST(CFLAGSTHREADS)
+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
+	OLIBS=$LIBS
+	AC_CHECK_LIB(pth,main)
+	if test "$ac_cv_lib_pth_main" = "yes"; then
+        	AC_CHECK_HEADERS(pth.h)
+		if test "$ac_cv_header_pth_h" = "yes"; then
+			LIBTHREAD="-lpth"
+			CFLAGSTHREADS="-DYAZ_GNU_THREADS=1"
+			HAVETHREADS=1
+		fi
+	fi	
+	LIBS=$OLIBS
+fi
+dnl
+dnl ------ POSIX Threads
+AC_ARG_ENABLE(threads, [  --disable-threads       disable POSIX threads],[enable_threads=$enableval],[enable_threads=yes])
+if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
+	OLIBS=$LIBS
+	OCC=$CC
+	AC_CHECK_LIB(pthread,main)
+	AC_MSG_CHECKING(for working POSIX Threads)
+	AC_TRY_LINK([#include <pthread.h>
+	void *func(void *p) { return 0; }
+	],[
+	pthread_t pthread_id;
+	pthread_create (&pthread_id, 0, func, 0);],
+		thread_ok=yes,thread_ok=no)
+	if test "$thread_ok" = "yes"; then
+		AC_MSG_RESULT(yes)
+		LIBTHREAD="-lpthread"
+		CFLAGSTHREADS="-DYAZ_POSIX_THREADS=1 -D_REENTRANT"
+		HAVETHREADS=1
+	else
+		CC="$CC -pthread"
+		AC_TRY_LINK([#include <pthread.h>
+			void *func(void *p) { return 0; }
+			],[
+			pthread_t pthread_id;
+			pthread_create (&pthread_id, 0, func, 0);],
+			thread_ok=yes,thread_ok=no)
+		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
+	if test "$thread_ok" = "no"; then
+		AC_MSG_RESULT(no)
+	fi
+	CC=$OCC
+	LIBS=$OLIBS
 fi
+AM_CONDITIONAL(ISTHR, test $HAVETHREADS = "1")
 dnl
-dnl ------ Threads
-AC_ARG_ENABLE(threads, [  --enable-threads        enable threads if available])
-if test "$enable_threads" = "yes"; then
-	AC_CHECK_HEADERS(pthread.h threads.h)
-	AC_CHECK_FUNC(pthread_mutex_lock)
-	if test "$ac_cv_func_pthread_mutex_lock" = "no"; then
-		AC_CHECK_LIB(pthread, main)
+dnl ----- libXML2
+AC_SUBST(XML2_LIBS)
+AC_SUBST(XML2_CFLAGS)
+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
+		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])
+		if test "$xml2dir" != "default"; then
+		        AC_MSG_ERROR([libXML2 development libraries missing])
+		fi
 	fi
-	AC_DEFINE(_REENTRANT)
 fi
 dnl
-SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest $DOCMODULE"
-AC_SUBST(SUBDIRS_VAR)
+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
 dnl ------ Makefiles
 dnl
-AC_OUTPUT(Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile ill/Makefile zutil/Makefile comstack/Makefile ccl/Makefile tab/Makefile retrieval/Makefile server/Makefile include/Makefile include/yaz/Makefile lib/Makefile client/Makefile ztest/Makefile doc/Makefile)
+AC_OUTPUT([
+Makefile
+yaz.spec
+src/Makefile
+test/Makefile
+util/Makefile
+include/Makefile
+include/yaz/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
+Doxyfile
+],[sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config])