From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 9 Jul 2019 11:34:51 +0000 (+0200)
Subject: Move the ax_{save,restore}_flags.m4 to libtool.m4 folder
X-Git-Tag: v9.11.9^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c989144d30b0ac6b6f77e4a0833e367f78a13dbc;p=thirdparty%2Fbind9.git

Move the ax_{save,restore}_flags.m4 to libtool.m4 folder
---

diff --git a/aclocal.m4 b/aclocal.m4
index 09c29112186..43f6e1ff377 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -288,8 +288,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
 
-m4_include([m4/ax_restore_flags.m4])
-m4_include([m4/ax_save_flags.m4])
+m4_include([libtool.m4/ax_save_flags.m4])
 m4_include([libtool.m4/libtool.m4])
 m4_include([libtool.m4/ltoptions.m4])
 m4_include([libtool.m4/ltsugar.m4])
diff --git a/m4/ax_restore_flags.m4 b/libtool.m4/ax_restore_flags.m4
similarity index 100%
rename from m4/ax_restore_flags.m4
rename to libtool.m4/ax_restore_flags.m4
diff --git a/m4/ax_save_flags.m4 b/libtool.m4/ax_save_flags.m4
similarity index 100%
rename from m4/ax_save_flags.m4
rename to libtool.m4/ax_save_flags.m4
diff --git a/util/copyrights b/util/copyrights
index 858e1e4ca75..cb7a235c2a2 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -4487,14 +4487,14 @@
 ./lib/win32/bindevt/bindevt.vcxproj.filters.in	X	2013,2015,2018,2019
 ./lib/win32/bindevt/bindevt.vcxproj.in		X	2013,2014,2015,2016,2018,2019
 ./lib/win32/bindevt/bindevt.vcxproj.user	X	2013,2018,2019
+./libtool.m4/ax_restore_flags.m4		X	2019
+./libtool.m4/ax_save_flags.m4			X	2019
 ./libtool.m4/libtool.m4				X	2012,2018,2019
 ./libtool.m4/ltoptions.m4			X	2012,2018,2019
 ./libtool.m4/ltsugar.m4				X	2012,2018,2019
 ./libtool.m4/ltversion.m4			X	2012,2018,2019
 ./libtool.m4/lt~obsolete.m4			X	2012,2018,2019
 ./ltmain.sh					X	1999,2000,2001,2003,2004,2006,2009,2012,2018,2019
-./m4/ax_restore_flags.m4			X	2019
-./m4/ax_save_flags.m4				X	2019
 ./make/Makefile.in				MAKE	1998,1999,2000,2001,2004,2007,2012,2016,2018,2019
 ./make/includes.in				MAKE	1999,2000,2001,2004,2005,2007,2012,2014,2016,2018,2019
 ./make/mkdep.in					X	1999,2000,2001,2006,2011,2014,2018,2019