build: Update tools, fixing configure and Makefiles.HEADmaster

* README_developer: Update.
* configure.ac (AH_BOTTOM): Add GTK_DISABLE_DEPRECATED define.
(AC_USE_SYSTEM_EXTENSIONS): Replace, instead of AC_GNU_SOURCE.
(GUILE_PKG, GUILE_FLAGS): Use this instead of PKG_CHECK_MODULES.
(AC_CONFIG_FILES): New.
(AC_OUTPUT): No args, with AC_CONFIG_FILES.
* icons/automake.mk (uninstall-icons): Add check with DESTDIR.
* po/automake.mk: Fix call of XGETTEXT with icons/gen-dot-desktop.scm.
Having --directory is enough.

Signed-off-by: NIIBE Yutaka <[email protected]>

4 files changed, 21 insertions, 15 deletions

diff --git a/README_developer b/README_developer
index 432cb8f..f0de1f6 100644
--- a/README_developer
+++ b/README_developer
@@ -3,10 +3,11 @@ To build this source from Git,  use
 ./autogen.sh
 
 It's been tested with 
-  autoconf 2.69
-  automake 1.11.6
-  make     3.81
-  gettext  0.18.1
+  autoconf 2.71
+  automake 1.16.5
+  make     4.3
+  gettext  0.21
+  guile    3.0.8
 
 Other versions may or may not work.
 
diff --git a/configure.ac b/configure.ac
index 7e0f111..db0b435 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,19 +13,24 @@ dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl    GNU General Public License for more details.
 dnl  
 dnl    You should have received a copy of the GNU General Public License
-dnl    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+dnl    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 dnl Process this file with autoconf to produce a configure script.
 
 
 AX_PREREQ(2.60)
-AC_INIT([GNUbik], [2.4.3], [[email protected]], [gnubik], [http://www.gnu.org/software/gnubik])
+AC_INIT([GNUbik],[2.4.3],[[email protected]],[gnubik],[https://www.gnu.org/software/gnubik])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
 
+dnl We use GTK+ 2.0 API, with no deprecated ones.
+AH_BOTTOM([
+#define GTK_DISABLE_DEPRECATED 1
+])
+
 dnl Checks for programs.
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
 AM_PROG_CC_C_O
 
@@ -70,12 +75,9 @@ PKG_CHECK_MODULES(GLU, glu,,
 
 
 dnl Checks for libraries.
-PKG_CHECK_MODULES(GUILE, guile-2.0,,
-  AC_SEARCH_LIBS([scm_c_string_length], [guile],,
-	AC_MSG_ERROR("Guile 2.0 or later is required"))
-)
-
+GUILE_PKG([3.0])
 GUILE_PROGS
+GUILE_FLAGS
 
 AC_SEARCH_LIBS([cos],[m],,
 	AC_MSG_ERROR("No maths library present" ))
@@ -106,5 +108,6 @@ AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
 
-AC_OUTPUT(Makefile po/Makefile)
+AC_CONFIG_FILES([Makefile po/Makefile])
+AC_OUTPUT
 
diff --git a/icons/automake.mk b/icons/automake.mk
index 8a89bc6..1010b6b 100644
--- a/icons/automake.mk
+++ b/icons/automake.mk
@@ -16,7 +16,9 @@ uninstall-icons:
 	for size in $(sizes); do \
           $(RM) $(themedir)/$${size}x$${size}/$(context)/gnubik.png ; \
 	done 
-	gtk-update-icon-cache --ignore-theme-index $(themedir)
+	if test -z $(DESTDIR) ; then \
+	 gtk-update-icon-cache --ignore-theme-index $(themedir) ; \
+	fi
 
 desktopdir=$(DESTDIR)$(datadir)/applications
 
diff --git a/po/automake.mk b/po/automake.mk
index f6620f8..9bc9cd3 100644
--- a/po/automake.mk
+++ b/po/automake.mk
@@ -56,7 +56,7 @@ XGETTEXT_OPTIONS = \
 $(POTFILE): $(DIST_SOURCES) $(dist_script_DATA) $(desktop_DATA) $(top_srcdir)/icons/gen-dot-desktop.scm
 	@$(MKDIR_P) po
 	$(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS) $(DIST_SOURCES) --language=C --keyword=_ --keyword=N_ -o $@
-	$(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS) $(dist_script_DATA) $(desktop_DATA) $(top_srcdir)/icons/gen-dot-desktop.scm --language=scheme --keyword=_ --keyword=N_ -j -o $@
+	$(XGETTEXT) --directory=$(top_srcdir) $(XGETTEXT_OPTIONS) $(dist_script_DATA) $(desktop_DATA) icons/gen-dot-desktop.scm --language=scheme --keyword=_ --keyword=N_ -j -o $@
 	$(SED) -e '/POT-Creation-Date: /d' $@ > $@,tmp
 	mv $@,tmp $@