summaryrefslogtreecommitdiff
path: root/Build/source/texk/cjkutils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-02-02 15:59:11 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-02-02 15:59:11 +0000
commitf819799e4a07199f253a7b6600b75d2e6f6ea3f6 (patch)
treee63bffc5c58a950266351a03a5e6452120e46106 /Build/source/texk/cjkutils
parent3557fddb20fecc528ea2d8907772cedeaff1c92d (diff)
automake 1.11.3
git-svn-id: svn://tug.org/texlive/trunk@25277 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/cjkutils')
-rw-r--r--Build/source/texk/cjkutils/Makefile.in41
-rw-r--r--Build/source/texk/cjkutils/aclocal.m415
-rwxr-xr-xBuild/source/texk/cjkutils/configure8
3 files changed, 37 insertions, 27 deletions
diff --git a/Build/source/texk/cjkutils/Makefile.in b/Build/source/texk/cjkutils/Makefile.in
index 055f2a02dda..9bb438e8839 100644
--- a/Build/source/texk/cjkutils/Makefile.in
+++ b/Build/source/texk/cjkutils/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -166,9 +166,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
@@ -409,6 +411,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
+$(srcdir)/../am/bin_links.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -476,31 +479,31 @@ clean-binPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
-bg5conv$(EXEEXT): $(bg5conv_OBJECTS) $(bg5conv_DEPENDENCIES)
+bg5conv$(EXEEXT): $(bg5conv_OBJECTS) $(bg5conv_DEPENDENCIES) $(EXTRA_bg5conv_DEPENDENCIES)
@rm -f bg5conv$(EXEEXT)
$(LINK) $(bg5conv_OBJECTS) $(bg5conv_LDADD) $(LIBS)
-cef5conv$(EXEEXT): $(cef5conv_OBJECTS) $(cef5conv_DEPENDENCIES)
+cef5conv$(EXEEXT): $(cef5conv_OBJECTS) $(cef5conv_DEPENDENCIES) $(EXTRA_cef5conv_DEPENDENCIES)
@rm -f cef5conv$(EXEEXT)
$(LINK) $(cef5conv_OBJECTS) $(cef5conv_LDADD) $(LIBS)
-cefconv$(EXEEXT): $(cefconv_OBJECTS) $(cefconv_DEPENDENCIES)
+cefconv$(EXEEXT): $(cefconv_OBJECTS) $(cefconv_DEPENDENCIES) $(EXTRA_cefconv_DEPENDENCIES)
@rm -f cefconv$(EXEEXT)
$(LINK) $(cefconv_OBJECTS) $(cefconv_LDADD) $(LIBS)
-cefsconv$(EXEEXT): $(cefsconv_OBJECTS) $(cefsconv_DEPENDENCIES)
+cefsconv$(EXEEXT): $(cefsconv_OBJECTS) $(cefsconv_DEPENDENCIES) $(EXTRA_cefsconv_DEPENDENCIES)
@rm -f cefsconv$(EXEEXT)
$(LINK) $(cefsconv_OBJECTS) $(cefsconv_LDADD) $(LIBS)
-extconv$(EXEEXT): $(extconv_OBJECTS) $(extconv_DEPENDENCIES)
+extconv$(EXEEXT): $(extconv_OBJECTS) $(extconv_DEPENDENCIES) $(EXTRA_extconv_DEPENDENCIES)
@rm -f extconv$(EXEEXT)
$(LINK) $(extconv_OBJECTS) $(extconv_LDADD) $(LIBS)
-gbklatex$(EXEEXT): $(gbklatex_OBJECTS) $(gbklatex_DEPENDENCIES)
+gbklatex$(EXEEXT): $(gbklatex_OBJECTS) $(gbklatex_DEPENDENCIES) $(EXTRA_gbklatex_DEPENDENCIES)
@rm -f gbklatex$(EXEEXT)
$(LINK) $(gbklatex_OBJECTS) $(gbklatex_LDADD) $(LIBS)
-gbkpdflatex$(EXEEXT): $(gbkpdflatex_OBJECTS) $(gbkpdflatex_DEPENDENCIES)
+gbkpdflatex$(EXEEXT): $(gbkpdflatex_OBJECTS) $(gbkpdflatex_DEPENDENCIES) $(EXTRA_gbkpdflatex_DEPENDENCIES)
@rm -f gbkpdflatex$(EXEEXT)
$(LINK) $(gbkpdflatex_OBJECTS) $(gbkpdflatex_LDADD) $(LIBS)
-hbf2gf$(EXEEXT): $(hbf2gf_OBJECTS) $(hbf2gf_DEPENDENCIES)
+hbf2gf$(EXEEXT): $(hbf2gf_OBJECTS) $(hbf2gf_DEPENDENCIES) $(EXTRA_hbf2gf_DEPENDENCIES)
@rm -f hbf2gf$(EXEEXT)
$(LINK) $(hbf2gf_OBJECTS) $(hbf2gf_LDADD) $(LIBS)
-sjisconv$(EXEEXT): $(sjisconv_OBJECTS) $(sjisconv_DEPENDENCIES)
+sjisconv$(EXEEXT): $(sjisconv_OBJECTS) $(sjisconv_DEPENDENCIES) $(EXTRA_sjisconv_DEPENDENCIES)
@rm -f sjisconv$(EXEEXT)
$(LINK) $(sjisconv_OBJECTS) $(sjisconv_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@@ -897,6 +900,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+ $(am__remove_distdir)
+
dist-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
@@ -933,6 +940,8 @@ distcheck: dist
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
@@ -1130,9 +1139,9 @@ uninstall-man: uninstall-man1
.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-TESTS \
check-am clean clean-binPROGRAMS clean-generic clean-libtool \
- ctags dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzma \
- dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
+ ctags dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzip \
+ dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
+ distclean distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-binSCRIPTS \
diff --git a/Build/source/texk/cjkutils/aclocal.m4 b/Build/source/texk/cjkutils/aclocal.m4
index 26959064bc7..acf9e6238f2 100644
--- a/Build/source/texk/cjkutils/aclocal.m4
+++ b/Build/source/texk/cjkutils/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.2], [],
+m4_if([$1], [1.11.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.2])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -914,7 +914,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -936,10 +936,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
diff --git a/Build/source/texk/cjkutils/configure b/Build/source/texk/cjkutils/configure
index fe16a088abd..57360889a7a 100755
--- a/Build/source/texk/cjkutils/configure
+++ b/Build/source/texk/cjkutils/configure
@@ -7380,11 +7380,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'