X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=db1eb8956aae74dff0f05747e10988aa51b620d6;hp=e4d778d588610fc83adffe5ddccb827300e3b99f;hb=0dedb6a7a6a0f0ddaf56cb0673978fdd85e64be1;hpb=e4e44d1916c6e80e01aad163b487ee41c22272ba

diff --git a/configure.ac b/configure.ac
index e4d778d..db1eb89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,24 +1,25 @@
 dnl This file is part of the Zebra server.
-dnl   Copyright (C) 1994-2011 Index Data
+dnl Copyright (C) Index Data. See LICENSE.zebra for details.
 dnl
 AC_PREREQ(2.60)
-AC_INIT([idzebra],[2.0.47],[zebra-help@indexdata.dk])
-AC_CONFIG_HEADERS(include/config.h)
-AC_CONFIG_SRCDIR(configure.ac)
-AC_CONFIG_AUX_DIR(config)
+AC_INIT([idzebra],
+m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']),
+[zebra-help@indexdata.dk])
+AC_CONFIG_HEADERS([include/config.h])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([1.9])
 PACKAGE_SUFFIX="-2.0"
 AC_SUBST(PACKAGE_SUFFIX)
 dnl http://www.gnu.org/software/libtool/manual.html#Versioning
 ZEBRALIBS_VERSION_INFO=0:1:0
-AC_SUBST(ZEBRALIBS_VERSION_INFO)
+AC_SUBST([ZEBRALIBS_VERSION_INFO])
 main_zebralib=index/libidzebra${PACKAGE_SUFFIX}.la
 AC_SUBST(main_zebralib)
 dnl ------ Substitutions
-AC_SUBST(TCL_INCLUDE)
-AC_SUBST(TCL_LIB)
-AC_SUBST(READLINE_LIBS)
-AC_SUBST(ZEBRA_CFLAGS)
+AC_SUBST([TCL_INCLUDE])
+AC_SUBST([TCL_LIB])
+AC_SUBST([ZEBRA_CFLAGS])
 dnl
 dnl ------ Checking programs
 AC_PROG_CC
@@ -30,7 +31,7 @@ AC_CHECK_HEADERS([sys/resource.h sys/time.h sys/wait.h sys/utsname.h unistd.h])
 dnl ------ crypt
 AC_CHECK_LIB([crypt],[crypt])
 if test "$ac_cv_lib_crypt_crypt" = "yes"; then
-    AC_CHECK_HEADERS(crypt.h)
+    AC_CHECK_HEADERS([crypt.h])
 fi
 dnl
 dnl ------ YAZ
@@ -153,13 +154,13 @@ if test "$ac_cv_lib_z_compress2" = "yes"; then
     AC_CHECK_HEADERS([zlib.h])
 fi
 dnl ------ -lm
-AC_CHECK_LIB(m,sqrt)
+AC_CHECK_LIB([m], [sqrt])
 dnl ------ -ldl
-AC_CHECK_LIB(dl,dlopen)
+AC_CHECK_LIB([dl], [dlopen])
 dnl
 dnl ------ EXPAT
 expat=yes
-AC_SUBST(EXPAT_LIBS)
+AC_SUBST([EXPAT_LIBS])
 AC_ARG_WITH(expat,   [  --with-expat[=DIR]        EXPAT library in DIR],[expat=$withval])
 if test "$expat" != "no"; then
     xLIBS="$LIBS";
@@ -189,11 +190,11 @@ fi
 ZEBRA_CFLAGS="-DZEBRA_ZINT=${ZINT_VALUE}"
 AC_DEFINE_UNQUOTED([ZEBRA_ZINT],${ZINT_VALUE},[Whehter zint is long long])
 dnl ------ Modules
-AC_SUBST(SHARED_MODULE_LA)
+AC_SUBST([SHARED_MODULE_LA])
 SHARED_MODULE_LA=""
-AC_SUBST(STATIC_MODULE_OBJ)
+AC_SUBST([STATIC_MODULE_OBJ])
 STATIC_MODULE_OBJ=""
-AC_SUBST(STATIC_MODULE_LADD)
+AC_SUBST([STATIC_MODULE_LADD])
 STATIC_MODULE_LADD=""
 AC_DEFUN([ZEBRA_MODULE],[
 	AC_ARG_ENABLE(mod-$1,[$3],[myen=$enableval],[myen=$2])
@@ -275,8 +276,8 @@ AC_STDC_HEADERS
 if test "$ac_cv_header_stdc" = "no"; then
     AC_MSG_WARN([Your system does not seem to support ANSI C])
 fi
-AC_SUBST(IDZEBRA_SRC_ROOT)
-AC_SUBST(IDZEBRA_BUILD_ROOT)
+AC_SUBST([IDZEBRA_SRC_ROOT])
+AC_SUBST([IDZEBRA_BUILD_ROOT])
 IDZEBRA_SRC_ROOT=`cd ${srcdir}; pwd`
 IDZEBRA_BUILD_ROOT=`pwd`
 dnl
@@ -310,7 +311,7 @@ AC_OUTPUT([
   include/Makefile include/idzebra/Makefile
   tab/Makefile
   doc/Makefile
-  doc/local.ent
+  doc/local0.ent
   doc/common/Makefile
   doc/common/print.dsl
   test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile
@@ -333,7 +334,11 @@ AC_OUTPUT([
   Doxyfile
   win/version.nsi
   include/idzebra/version.h
-],[sed s%echo_source=yes%echo_source=no%g < idzebra-config-2.0 > util/idzebra-config-2.0 && chmod +x idzebra-config-2.0 util/idzebra-config-2.0])
+],[
+	sed s%echo_source=yes%echo_source=no%g < idzebra-config-2.0 > util/idzebra-config-2.0 && chmod +x idzebra-config-2.0 util/idzebra-config-2.0
+	diff doc/local.ent doc/local0.ent >/dev/null 2>/dev/null \
+		|| cp doc/local0.ent doc/local.ent
+])
 
 echo \
 "------------------------------------------------------------------------