X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=f4a79c658e7050334891444aebab1778ee3e2261;hp=d72b51ec17b7ca8306b92c6fc84f555b56e20769;hb=be89f721ce59303c3f7261b7bf86b971dff18376;hpb=a0e777e0003305532d60edce436ae8f4cc360453

diff --git a/configure.ac b/configure.ac
index d72b51e..f4a79c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,14 @@
 dnl This file is part of the YAZ toolkit.
-dnl Copyright (C) 1995-2011 Index Data
+dnl Copyright (C) Index Data
+dnl See the file LICENSE for details.
 AC_PREREQ([2.60])
-AC_INIT([yaz],[4.2.0],[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([subdir-objects])
 dnl
 AC_SUBST([READLINE_LIBS])
 AC_SUBST([YAZ_CONF_CFLAGS])
@@ -20,7 +23,7 @@ AM_PROG_LIBTOOL
 AC_PATH_PROG([pkgconfigpath],[pkg-config],[NONE])
 dnl
 YAZ_DOC
-dnl 
+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 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],[],[],[
@@ -56,8 +59,15 @@ if test "$checkBoth" = "1"; then
     AC_CHECK_FUNC([accept], , [LIBS=$oldLibs])
 fi
 AC_CHECK_FUNC([gethostbyname], ,[AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"])])
-dnl
-
+dnl ------ memcached
+memcached=default
+AC_ARG_WITH([memcached], [  --with-memcached        Memcached library], [memcached=$withval])
+if test "$memcached" != "no"; then
+    AC_CHECK_LIB([memcached],[memcached_get])
+    if test "$ac_cv_lib_memcached_memcached_get" = "yes"; then
+	AC_CHECK_HEADERS([libmemcached/memcached.h])
+    fi
+fi
 dnl ------ OpenSSL
 AC_SUBST([SSL_CFLAGS])
 AC_SUBST([SSL_LIBS])
@@ -321,8 +331,8 @@ if test "$enable_threads" = "yes" -a "$HAVETHREADS" = "0"; then
     ACX_PTHREAD([
 	    OCFLAGS=$CFLAGS
 	    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-	    dnl unfortunately empty thread lib spec is problematic because 
-            dnl 'yaz-config --cflags' is not always passed to linker in 
+	    dnl unfortunately empty thread lib spec is problematic because
+            dnl 'yaz-config --cflags' is not always passed to linker in
             dnl applications using YAZ (such as Zebra).
 	    if test "x$PTHREAD_LIBS" = "x"; then
 		OLIBS=$LIBS
@@ -360,7 +370,7 @@ if test "$xml_enabled" = "true"; then
 	    AC_DEFINE(YAZ_HAVE_EXSLT,1,[Define to 1 if EXSLT is present])
 	    YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS -DYAZ_HAVE_EXSLT=1"
 	])
-    
+
 fi
 YAZ_CONFIG_CFLAGS="$YAZ_CONFIG_CFLAGS $XML2_CFLAGS"
 
@@ -369,7 +379,7 @@ if test "$XML2_LIBS"; then
 fi
 
 dnl
-dnl 
+dnl
 AC_CHECK_ICU([3.4],[
 	if test "$xml_enabled" = "true"; then
 	    ICU_CPPFLAGS="$ICU_CPPFLAGS -D YAZ_HAVE_ICU=1"
@@ -404,7 +414,7 @@ client/Makefile
 ztest/Makefile
 zoom/Makefile
 doc/Makefile
-doc/local.ent
+doc/local0.ent
 doc/common/Makefile
 doc/common/print.dsl
 etc/Makefile
@@ -415,6 +425,8 @@ win/version.nsi
 include/yaz/yaz-version.h
 ],[
 	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
     ]
 )