summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2018-09-17 11:34:36 +0200
committerBruno Haible <bruno@clisp.org>2018-09-17 11:56:17 +0200
commit187071f3cf8189296927a0bc6478db6af149b4f5 (patch)
tree40ae0a3de2e4b186d2de80da255e2af6bd91fc7c
parent89e580a80935bce446a3a5526a25caf151bca297 (diff)
downloadlibunistring-187071f3cf8189296927a0bc6478db6af149b4f5.tar.gz
Remove the 'fixaclocal' auxiliary script.
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am3
-rwxr-xr-xautogen.sh2
-rwxr-xr-xbuild-aux/fixaclocal35
4 files changed, 10 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index a615594..946f339 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-09-17 Bruno Haible <bruno@clisp.org>
+
+ Remove the 'fixaclocal' auxiliary script.
+ * autogen.sh: Don't invoke fixaclocal.
+ * Makefile.am (ACLOCAL): Remove override.
+ (EXTRA_DIST): Remove build-aux/fixaclocal.
+ * build-aux/fixaclocal: Remove file.
+
2018-05-17 Bruno Haible <bruno@clisp.org>
Prepare for 0.9.10 release.
diff --git a/Makefile.am b/Makefile.am
index 430d5b6..fdc3e68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,14 +17,13 @@
## Process this file with automake to produce Makefile.in.
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
-ACLOCAL = build-aux/fixaclocal @ACLOCAL@
ACLOCAL_AMFLAGS = -I m4 -I gnulib-m4
SUBDIRS = doc gnulib-local lib tests
EXTRA_DIST = \
version.sh BUGS DEPENDENCIES HACKING autogen.sh \
- build-aux/fixaclocal build-aux/texi2html build-aux/run-test
+ build-aux/texi2html build-aux/run-test
# Allow users to use "gnulib-tool --update".
diff --git a/autogen.sh b/autogen.sh
index 7cb5cbf..3792b35 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -465,7 +465,7 @@ if test $skip_gnulib = false; then
fi
fi
-build-aux/fixaclocal aclocal -I m4 -I gnulib-m4
+aclocal -I m4 -I gnulib-m4
autoconf
autoheader && touch config.h.in
# Make sure we get new versions of files brought in by automake.
diff --git a/build-aux/fixaclocal b/build-aux/fixaclocal
deleted file mode 100755
index 5fba94f..0000000
--- a/build-aux/fixaclocal
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# Script for fixing aclocal.m4 files produced by 'aclocal' from automake 1.10.
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-# Usage: fixaclocal aclocal [OPTIONS]
-
-"$@"
-result=$?
-if test $result = 0 && test -f aclocal.m4; then
- # Remove the block of 4 lines starting with 'm4_if(m4_PACKAGE_VERSION'
- # and the block of 5 lines starting with 'm4_if(AC_AUTOCONF_VERSION'
- # (automake <= 1.10.1) or with 'm4_if(m4_defn([AC_AUTOCONF_VERSION])'
- # (automake >= 1.10.2).
- sed -e '/m4_if(m4_PACKAGE_VERSION/{N;N;N;d}' -e '/m4_if(AC_AUTOCONF_VERSION/{N;N;N;N;d}' -e '/m4_if(m4_defn(\[AC_AUTOCONF_VERSION\])/{N;N;N;N;d}' < aclocal.m4 > aclocal.m4.tmp
- if cmp aclocal.m4 aclocal.m4.tmp > /dev/null; then
- rm -f aclocal.m4.tmp
- else
- mv aclocal.m4.tmp aclocal.m4
- fi
-else
- exit $result
-fi