From 9c0cdc78c1d67d8fa605bccae7b3c39324ab7107 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 6 Jul 2010 09:17:20 +0000 Subject: add version.ac to define current TL version git-svn-id: svn://tug.org/texlive/trunk@19260 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 4 ++++ Build/source/texk/web2c/Makefile.in | 3 ++- Build/source/texk/web2c/configure.ac | 6 +++--- Build/source/texk/web2c/doc/Makefile.in | 3 ++- Build/source/texk/web2c/lib/Makefile.in | 3 ++- Build/source/texk/web2c/man/Makefile.in | 3 ++- Build/source/texk/web2c/omegafonts/Makefile.in | 3 ++- Build/source/texk/web2c/otps/Makefile.in | 3 ++- Build/source/texk/web2c/window/Makefile.in | 3 ++- 9 files changed, 21 insertions(+), 10 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 2c0bf8eb82e..898773efd65 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2010-07-06 Peter Breitenlohner + + * configure.ac: Get version string from ../../version.ac. + 2010-06-13 Karl Berry * doc/web2c.texi (mpost): mention .mps extension. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index b49dbe979e0..bee51f45e28 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -216,7 +216,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/ac/web2c.ac $(top_srcdir)/configure.ac + $(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 85a0f4eafa7..4c94ae25444 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -19,8 +19,8 @@ dnl get these features if you are willing to hack the sources. If not, dnl it'll take a good argument to convince me to invest the time to make dnl them configurable. dnl -m4_define([web2_version], [2010]) -AC_INIT([Web2C], web2_version(), [tex-k@tug.org]) +m4_include([../../version.ac])[] dnl define tex_live_version +AC_INIT([Web2C], tex_live_version(), [tex-k@tug.org]) AC_PREREQ([2.65]) dnl dnl We don't use (for example) tex/tex.web because people who only want @@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([cpascal.h]) AC_CONFIG_AUX_DIR([../../build-aux]) AC_CONFIG_MACRO_DIR([../../m4]) -WEB2CVERSION=web2_version() +WEB2CVERSION=tex_live_version() AC_SUBST([WEB2CVERSION]) dnl Common code for all programs using libkpathsea. diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index 96f8d3f8e1a..da7f9d5658c 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -66,7 +66,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/ac/web2c.ac $(top_srcdir)/configure.ac + $(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index d3c6df6a9e6..e8003e8f7e3 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -68,7 +68,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/ac/web2c.ac $(top_srcdir)/configure.ac + $(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index fcb08bb7af1..f96d4bdf723 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -80,7 +80,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/ac/web2c.ac $(top_srcdir)/configure.ac + $(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index c7a335ae3a9..aea4f7a2e44 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -70,7 +70,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/ac/web2c.ac $(top_srcdir)/configure.ac + $(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index 7dbb5d7d9a4..458c58bcae7 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -72,7 +72,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/ac/web2c.ac $(top_srcdir)/configure.ac + $(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in index e2594d32022..12a26ba807e 100644 --- a/Build/source/texk/web2c/window/Makefile.in +++ b/Build/source/texk/web2c/window/Makefile.in @@ -68,7 +68,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/ac/web2c.ac $(top_srcdir)/configure.ac + $(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d -- cgit v1.2.3