X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=configure.ac;h=4bfb544d529cfdf0b35dd4b546e576334f47306a;hp=b73bfd9aa8fec8e2c953fd5bd26bb38bba4fbc60;hb=473824797f568578dc17d7242551cb2f7ccef46c;hpb=0c46d2e66bdeea1600e700124a81a5d0a65d349e diff --git a/configure.ac b/configure.ac index b73bfd9..4bfb544 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,6 @@ dnl This file is part of the YAZ toolkit. -dnl Copyright (C) 1995-2013 Index Data +dnl Copyright (C) Index Data +dnl See the file LICENSE for details. AC_PREREQ([2.60]) AC_INIT([yaz], m4_esyscmd([. ./IDMETA; echo $VERSION|tr -d '\n']), @@ -7,7 +8,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 +AM_INIT_AUTOMAKE([subdir-objects]) dnl AC_SUBST([READLINE_LIBS]) AC_SUBST([YAZ_CONF_CFLAGS]) @@ -406,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 @@ -417,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 ] )