X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=bb5bca580e1e0fa8bfa287ceb827dc20f8476e5d;hp=41ccf457742a6a02da42ad140bc1c6d2c16872e9;hb=5541b773e8ee0e5c086946016c060f6f629bd410;hpb=df8b0a83e237b1f7ff6722a2f10add5cafceeb9d

diff --git a/configure.ac b/configure.ac
index 41ccf45..bb5bca5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,13 @@
 dnl This file is part of the YAZ toolkit.
-dnl Copyright (C) 1995-2009 Index Data
+dnl Copyright (C) 1995-2013 Index Data
 AC_PREREQ([2.60])
-AC_INIT([yaz],[3.0.42],[yaz-help@indexdata.dk])
+AC_INIT([yaz],
+m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']),
+[yaz-help@indexdata.dk])
+AC_CONFIG_HEADERS(include/config.h)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE
 dnl
 AC_SUBST([READLINE_LIBS])
 AC_SUBST([YAZ_CONF_CFLAGS])
@@ -21,7 +24,7 @@ dnl
 YAZ_DOC
 dnl 
 dnl
-AC_CHECK_HEADERS([dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h unistd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/times.h sys/types.h sys/un.h sys/wait.h netdb.h arpa/inet.h netinet/tcp.h netinet/in_systm.h],[],[],[])
+AC_CHECK_HEADERS([dirent.h fnmatch.h wchar.h locale.h langinfo.h pwd.h unistd.h sys/select.h sys/socket.h sys/stat.h sys/time.h sys/times.h sys/types.h sys/un.h sys/wait.h sys/prctl.h netdb.h arpa/inet.h netinet/tcp.h netinet/in_systm.h],[],[],[])
 AC_CHECK_HEADERS([net/if.h netinet/in.h netinet/if_ether.h],[],[],[
  #if HAVE_SYS_TYPES_H
  #include <sys/types.h>
@@ -112,7 +115,7 @@ if test "$openssl" != "no"; then
     fi
     AC_MSG_CHECKING([for SSL])
     if test "$sslver" != "no"; then
-	SSL_CFLAGS="-DHAVE_OPENSSL_SSL_H=1 $SSL_CFLAGS"
+	AC_DEFINE([HAVE_OPENSSL_SSL_H],[1],[Define to 1 if OpenSSL is present])
 	AC_MSG_RESULT([$sslver])
     else
 	SSL_CFLAGS=""
@@ -146,7 +149,7 @@ if test "$gnutls" != "no" -a "$sslver" = "no"; then
     fi
     AC_MSG_CHECKING([for GNU TLS])
     if test "$gnutlsver" != "no"; then
-	SSL_CFLAGS="-DHAVE_GNUTLS_H=1 $SSL_CFLAGS"
+	AC_DEFINE([HAVE_GNUTLS_H],[1],[Define to 1 if GNUTLS is present])
 	AC_MSG_RESULT([$gnutlsver])
     else
 	SSL_CFLAGS=""
@@ -174,13 +177,13 @@ if test "$ac_cv_lib_readline_readline" = "yes"; then
 	#include <readline/readline.h>
 	    ],[
 	    rl_attempted_completion_over = 0;
-	    ],AC_DEFINE([HAVE_READLINE_COMPLETION_OVER]))
+	    ],AC_DEFINE([HAVE_READLINE_COMPLETION_OVER],1,[Define to 1 if rl_attempted_completion_over is defined]))
     AC_TRY_LINK([
 	#include <stdio.h>
 	#include <readline/readline.h>
 	    ],[
 	    rl_completion_matches (0, 0);
-	    ],[AC_DEFINE([HAVE_READLINE_RL_COMPLETION_MATCHES])])
+	    ],[AC_DEFINE([HAVE_READLINE_RL_COMPLETION_MATCHES],1,[Define to 1 if rl_completion_matches is defined])])
     LIBS=$xLIBS
 fi
 dnl ------ iconv
@@ -198,7 +201,7 @@ if test "$with_iconv" != "no"; then
 	    ],[
 	    iconv_t t = iconv_open("", "");
 	    ],[
-	    AC_DEFINE([HAVE_ICONV_H])
+	    AC_DEFINE([HAVE_ICONV_H],1,[Define to 1 if iconv.h is present])
 	    AC_MSG_RESULT([yes])
 	    ],[
 	    LIBS="$LIBS -liconv"
@@ -207,7 +210,7 @@ if test "$with_iconv" != "no"; then
 		    ],[
 	    iconv_t t = iconv_open("", "");
 		    ],[
-	    AC_DEFINE([HAVE_ICONV_H])
+	    AC_DEFINE([HAVE_ICONV_H],1)
 	    AC_MSG_RESULT([yes])
 		    ],[
 	    LIBS="$oldLIBS"
@@ -278,8 +281,7 @@ 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])
+AC_DEFINE_UNQUOTED([YAZ_SOCKLEN_T],[$ac_cv_check_socklen_t],[socklen_t type])
 dnl
 dnl ------ tcpd
 AC_ARG_ENABLE([tcpd],[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
@@ -299,16 +301,18 @@ if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
 	[struct request_info request_info; int i;
 	    i = hosts_access(&request_info);],
 	tcpd_ok=1, tcpd_ok=0)
+    LIBS=$oldLibs
     if test "$tcpd_ok" = "0"; then
 	AC_MSG_RESULT([no])
 	AC_MSG_ERROR([tcpd development libraries missing])
-		LIBS=$oldLibs
-		CPPFLAGS=$oldCPPFLAGS
+	CPPFLAGS=$oldCPPFLAGS
     else
+	TCPD_LIBS="-lwrap"
 	AC_MSG_RESULT([yes])
-	AC_DEFINE([HAVE_TCPD_H])
+	AC_DEFINE([HAVE_TCPD_H],1,[Define to 1 if tcp wrap library is present])
     fi
 fi
+AC_SUBST([TCPD_LIBS])
 dnl
 AC_SUBST([YAZ_CONFIG_CFLAGS])
 dnl
@@ -333,8 +337,9 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
 		done
 		LIBS=$OLIBS
 	    fi
-	    CFLAGS=$OCFLAGS
-	    PTHREAD_CFLAGS="$PTHREAD_CFLAGS -DYAZ_POSIX_THREADS=1"
+	    LIBS="$LIBS $PTHREAD_LIBS"
+	    AC_DEFINE(YAZ_POSIX_THREADS,1,[Define to 1 if POSIX threads is present])
+	    YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_POSIX_THREADS=1"
 	    ])
 fi
 
@@ -343,18 +348,18 @@ AC_SUBST([XML2_CFLAGS])
 
 xml_enabled=false
 YAZ_LIBXML2([
-	AC_DEFINE(YAZ_HAVE_XML2) 
+	AC_DEFINE(YAZ_HAVE_XML2,1,[Define to 1 if Libxml2 is present])
 	YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XML2=1"
 	xml_enabled=true
     ])
 
 if test "$xml_enabled" = "true"; then
     YAZ_LIBXSLT([
-	    AC_DEFINE(YAZ_HAVE_XSLT)
+	    AC_DEFINE(YAZ_HAVE_XSLT,1,[Define to 1 if Libxslt is present])
 	    YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XSLT=1"
 	])
     YAZ_LIBEXSLT([
-	    AC_DEFINE(YAZ_HAVE_EXSLT)
+	    AC_DEFINE(YAZ_HAVE_EXSLT,1,[Define to 1 if EXSLT is present])
 	    YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1"
 	])
     
@@ -375,21 +380,6 @@ AC_CHECK_ICU([3.4],[
 	    AC_MSG_WARN([ICU support disabled because XML support is unavailable])
 	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
 dnl ------ versioning
 dnl
 WIN_FILEVERSION=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { m = $4; printf("%d,%d,%d,%d", $1, $2, $3 == "" ? "0" : $3, $4 == "" ? "1" : $4);}'`
@@ -407,7 +397,6 @@ dnl ------ Makefiles
 dnl
 AC_OUTPUT([
 Makefile
-yaz.spec
 src/Makefile
 test/Makefile
 util/Makefile
@@ -417,7 +406,7 @@ client/Makefile
 ztest/Makefile
 zoom/Makefile
 doc/Makefile
-doc/local.ent
+doc/local0.ent
 doc/common/Makefile
 doc/common/print.dsl
 etc/Makefile
@@ -427,7 +416,9 @@ Doxyfile
 win/version.nsi
 include/yaz/yaz-version.h
 ],[
-	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%echo_source=yes%echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config
+	diff doc/local.ent doc/local0.ent >/dev/null 2>/dev/null \
+		|| cp doc/local0.ent doc/local.ent
     ]
 )