3 files changed, 37 insertions, 3 deletions
diff --git a/intl/Makefile.in b/intl/Makefile.in
index ec8c648b7a9..409d693c48e 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -50,6 +50,10 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 DEFS = -DHAVE_CONFIG_H
 
+CTAGS = @CTAGS@
+ETAGS = @ETAGS@
+MKID = @MKID@
+
 COMPILE = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(DEFS-$@) $(INCLUDES)
 
 HEADERS = \
@@ -176,17 +180,17 @@ localealias.o localcharset.o relocatable.o: relocatable.h
 tags: TAGS
 TAGS: $(HEADERS) $(SOURCES)
 	here=`pwd`; cd $(srcdir) && \
-		etags -o $$here/TAGS $(HEADERS) $(SOURCES)
+		$(ETAGS) -o $$here/TAGS $(HEADERS) $(SOURCES)
 
 ctags: CTAGS
 CTAGS: $(HEADERS) $(SOURCES)
 	here=`pwd`; cd $(srcdir) && \
-		ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
+		$(CTAGS) -o $$here/CTAGS $(HEADERS) $(SOURCES)
 
 id: ID
 ID: $(HEADERS) $(SOURCES)
 	here=`pwd`; cd $(srcdir) && \
-		mkid -f$$here/ID $(HEADERS) $(SOURCES)
+		$(MKID) -f$$here/ID $(HEADERS) $(SOURCES)
 
 mostlyclean:
 	rm -f *.a *.la *.o *.obj *.lo core core.* libintl.h
diff --git a/intl/configure b/intl/configure
index 9d4f5000f9e..03f40487a92 100755
--- a/intl/configure
+++ b/intl/configure
@@ -627,6 +627,9 @@ BISON3_NO
 BISON3_YES
 INCINTL
 LIBINTL_DEP
+MKID
+ETAGS
+CTAGS
 MAINT
 AUTOHEADER
 AUTOCONF
@@ -6799,6 +6802,19 @@ else
 fi
 
 
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+
+if test -z "$MKID"; then
+  MKID=mkid
+fi
+
+
 # Additional info for config.intl.
 
 
diff --git a/intl/configure.ac b/intl/configure.ac
index 72b145958cf..16a740aa230 100644
--- a/intl/configure.ac
+++ b/intl/configure.ac
@@ -32,6 +32,20 @@ else
 fi
 AC_SUBST(MAINT)
 
+dnl Variables for tags utilities; based on automake 1.16.4+'s init.m4
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+AC_SUBST([CTAGS])
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+AC_SUBST([ETAGS])
+if test -z "$MKID"; then
+  MKID=mkid
+fi
+AC_SUBST([MKID])
+
 # Additional info for config.intl.
 AC_SUBST(LIBINTL_DEP)
 AC_SUBST(INCINTL)