Drop unused substituted variables

Drop a lot of the gettext generated variables which are never used.

Makefile.config.in

@@ -39,28 +39,21 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 ASCIIDOC = @ASCIIDOC@
 AWK = @AWK@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CG_COMMIT_ID = @CG_COMMIT_ID@
 CONFDIR = @CONFDIR@
-DATADIRNAME = @DATADIRNAME@
-GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GUILE_CFLAGS = @GUILE_CFLAGS@
-GUILE_CONFIG = @GUILE_CONFIG@
-INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 JW = @JW@
 LIBDIR = @LIBDIR@
-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
 LOCALEDIR = @LOCALEDIR@
 LUA_CFLAGS = @LUA_CFLAGS@
 LUA_LIBS = @LUA_LIBS@
@@ -71,8 +64,6 @@ PACKAGE = @PACKAGE@
 PERL_CFLAGS = @PERL_CFLAGS@
 PERL_LIBS = @PERL_LIBS@
 POD2HTML = @POD2HTML@
-POFILES = @POFILES@
-POSUB = @POSUB@
 PYTHON_CFLAGS = @PYTHON_CFLAGS@
 PYTHON_LIBS = @PYTHON_LIBS@
 RANLIB = @RANLIB@
@@ -80,7 +71,6 @@ RUBY_CFLAGS = @RUBY_CFLAGS@
 RUBY_LIBS = @RUBY_LIBS@
 SPIDERMONKEY_CFLAGS = @SPIDERMONKEY_CFLAGS@
 SPIDERMONKEY_LIBS = @SPIDERMONKEY_LIBS@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 VERSION = @VERSION@
 XMLTO = @XMLTO@
 X_CFLAGS = @X_CFLAGS@

config/m4/gettext.m4

@@ -52,10 +52,6 @@ AC_DEFUN([AM_WITH_NLS],
     AC_MSG_RESULT($CONFIG_NLS)
     AC_SUBST(CONFIG_NLS)
 
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-    INTLLIBS=
-
     AM_CONDITIONAL(CONFIG_NLS, test "$CONFIG_NLS" = "yes")
 
     dnl If we use NLS figure out what method
@@ -74,17 +70,12 @@ dnl      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
       nls_cv_use_gnu_gettext=yes
 
       dnl Mark actions used to generate GNU NLS library.
-      INTLOBJS="\$(GETTOBJS)"
       AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
 	[$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
       AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
       AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
 	[$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
       AC_SUBST(MSGFMT)
-      BUILD_INCLUDED_LIBINTL=yes
-      USE_INCLUDED_LIBINTL=yes
-      CATOBJEXT=.gmo
-      INTLLIBS="ifelse([$3],[],\$(top_builddir)/src/intl/gettext,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a"
       LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       LIBS="$LIBS $LIBICONV"
 
@@ -115,18 +106,9 @@ dnl      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
 	  XGETTEXT=":"
 	fi
       fi
-
-      dnl We need to process the po/ directory.
-      POSUB=po
     fi
 
 
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
     dnl intl/plural.c is generated from intl/plural.y. It requires bison,
     dnl because plural.y uses bison specific features. It requires at least
     dnl bison-1.26 because earlier versions generate a plural.c that doesn't
@@ -163,35 +145,15 @@ changequote([,])dnl
     dnl in configure.in.
     for lang in $ALL_LINGUAS; do
       GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
     done
 
     dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
     AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
     AC_SUBST(GMOFILES)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(INTLOBJS)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
 
     dnl For backward compatibility. Some configure.ins may be using this.
     nls_cv_header_intl=
     nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
   ])
 
 dnl Usage: Just like AM_WITH_NLS, which see.