Delete trailing whitespace

[yaz-moved-to-github.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 441b971..1be1a8b 100644 (file)
--- 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.1.7],[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],[],[],[
@@ -321,8 +324,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 +363,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 +372,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 +407,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 +418,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
     ]
 )