X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=de8d159b8df989e9605fc1b71cc4602ef7246fb3;hp=d148e32634ba42fadf2c4136ab013131d6dfa403;hb=d16b967479372b2ad3fdc8f348c0d1808710039a;hpb=77c5a4fca8b516fd39b8ba213daed17a465a6b2a diff --git a/configure.ac b/configure.ac index d148e32..de8d159 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl This file is part of the YAZ toolkit. -dnl Copyright (C) 1995-2012 Index Data +dnl Copyright (C) 1995-2013 Index Data AC_PREREQ([2.60]) AC_INIT([yaz], m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']), @@ -7,7 +7,7 @@ m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']), 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]) @@ -406,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 @@ -417,6 +417,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 ] )