From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 16 Nov 2012 10:27:55 +0000 (+0100)
Subject: build: fix unneeded workaround for AC_CONFIG_LINKS old bud
X-Git-Tag: v2.69b~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54bce5436802b27de84b184ecc86bdde7c8e1403;p=thirdparty%2Fautoconf.git

build: fix unneeded workaround for AC_CONFIG_LINKS old bud

* configure.ac: The Automake NEWS entry for version 1.11 states that

    For AC_CONFIG_LINKS, if source and destination are equal, do
    not remove the file in a non-VPATH build.  Such setups work
    with Autoconf 2.62 or newer.

Since our build system requires autoconf >= 2.62 and automake >= 1.11
already, we can get rid of the workaround for that long-fixed bug.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/configure.ac b/configure.ac
index c6291b30..34522184 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,13 +205,7 @@ AC_PROG_MAKE_CASE_SENSITIVE
 ## ------------ ##
 
 dnl Allow maintainer rules under GNU make even in VPATH builds.
-dnl Meanwhile, we must use a shell variable so that we bypass automake's
-dnl attempts to remove the sole copy of GNUmakefile in a non-VPATH build
-dnl during 'make distclean'.
-dnl TODO avoid the shell variable once automake is fixed.
-GNUmakefile=GNUmakefile
-AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
-                [GNUmakefile=$GNUmakefile])
+AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
 
 AC_CONFIG_FILES([Makefile doc/Makefile
 		 lib/Makefile lib/Autom4te/Makefile lib/autoscan/Makefile