X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=c31a5e983b7abae37322ce95452806e5538976e2;hp=edd00c2d64d30b81d08d70e245c6deced7b44556;hb=4e077901ce8ec84a24186bf6f00851b64a00a8a7;hpb=3a97efa8f888c8f5a5e36ad9ca004b55e0cca2c6

diff --git a/configure.ac b/configure.ac
index edd00c2..c31a5e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl This file is part of the YAZ toolkit.
-dnl Copyright (C) 1995-2008 Index Data
+dnl Copyright (C) 1995-2010 Index Data
 AC_PREREQ([2.60])
-AC_INIT([yaz],[3.0.29],[yaz-help@indexdata.dk])
+AC_INIT([yaz],[4.0.11],[yaz-help@indexdata.dk])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.9])
@@ -21,7 +21,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>
@@ -131,7 +131,7 @@ if test "$gnutls" != "no" -a "$sslver" = "no"; then
 	if test -x $gnutls/bin/pkg-config; then
 	    if $gnutls/bin/pkg-config --exists gnutls; then
 		SSL_CFLAGS=`$gnutls/bin/pkg-config --cflags gnutls`
-		SSL_LIBS="`$gnutls/bin/pkg-config --libs gnutls` -lgnutls-openssl"
+		SSL_LIBS="`$gnutls/bin/pkg-config --libs gnutls`"
 		gnutlsver=`$gnutls/bin/pkg-config --modversion gnutls`
 	    fi
 	fi
@@ -139,7 +139,7 @@ if test "$gnutls" != "no" -a "$sslver" = "no"; then
 	if test "$pkgconfigpath" != "NONE"; then
 	    if $pkgconfigpath --exists gnutls; then
 		SSL_CFLAGS=`$pkgconfigpath --cflags gnutls`
-		SSL_LIBS="`$pkgconfigpath --libs gnutls` -lgnutls-openssl"
+		SSL_LIBS="`$pkgconfigpath --libs gnutls`"
 		gnutlsver=`$pkgconfigpath --modversion gnutls`
 	    fi
 	fi
@@ -299,16 +299,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])
     fi
 fi
+AC_SUBST([TCPD_LIBS])
 dnl
 AC_SUBST([YAZ_CONFIG_CFLAGS])
 dnl
@@ -333,8 +335,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"
+	    CFLAGS="$CFLAGS -DYAZ_POSIX_THREADS=1"
+	    YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_POSIX_THREADS=1"
 	    ])
 fi
 
@@ -348,15 +351,17 @@ YAZ_LIBXML2([
 	xml_enabled=true
     ])
 
-YAZ_LIBXSLT([
-	AC_DEFINE(YAZ_HAVE_XSLT)
-	YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XSLT=1"
-    ])
-YAZ_LIBEXSLT([
-	AC_DEFINE(YAZ_HAVE_EXSLT)
-	YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1"
-    ])
-	
+if test "$xml_enabled" = "true"; then
+    YAZ_LIBXSLT([
+	    AC_DEFINE(YAZ_HAVE_XSLT)
+	    YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_XSLT=1"
+	])
+    YAZ_LIBEXSLT([
+	    AC_DEFINE(YAZ_HAVE_EXSLT)
+	    YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1"
+	])
+    
+fi
 YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS $XML2_CFLAGS"
 
 if test "$XML2_LIBS"; then
@@ -365,7 +370,7 @@ fi
 
 dnl
 dnl 
-AC_CHECK_ICU([3.6],[
+AC_CHECK_ICU([3.4],[
 	if test "$xml_enabled" = "true"; then
 	    ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"
 	else
@@ -387,9 +392,19 @@ AC_SUBST([YAZ_SRC_ROOT])
 AC_SUBST([YAZ_BUILD_ROOT])
 YAZ_SRC_ROOT=`cd ${srcdir}; pwd`
 YAZ_BUILD_ROOT=`pwd`
-
-dnl ------ windows version files
-WIN_FILEVERSION=`echo $PACKAGE_VERSION|tr . ,`.1
+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);}'`
+AC_SUBST([WIN_FILEVERSION])
+VERSION_HEX=`echo $PACKAGE_VERSION | $AWK 'BEGIN { FS = "."; } { printf("%x", ($1 * 256 + $2) * 256 + $3);}'`
+AC_SUBST([VERSION_HEX])
+if test -d ${srcdir}/.git; then
+    VERSION_SHA1=`git show --pretty=format:%H|head -1`
+else
+    VERSION_SHA1=`head -1 ${srcdir}/ChangeLog|awk '{print $2}'`
+fi
+AC_SUBST([VERSION_SHA1])
 dnl
 dnl ------ Makefiles
 dnl
@@ -412,6 +427,8 @@ etc/Makefile
 yaz-config
 yaz.pc
 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
     ]