diff options
| -rw-r--r-- | Build/source/texk/mendexk/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/mendexk/Makefile.in | 2 | ||||
| -rw-r--r-- | Build/source/texk/mendexk/c-auto.in | 3 | ||||
| -rwxr-xr-x | Build/source/texk/mendexk/configure | 5 | ||||
| -rw-r--r-- | Build/source/texk/mendexk/configure.ac | 6 | ||||
| -rw-r--r-- | Build/source/texk/mendexk/main.c | 1 |
6 files changed, 19 insertions, 3 deletions
diff --git a/Build/source/texk/mendexk/ChangeLog b/Build/source/texk/mendexk/ChangeLog index f5dc6dbee3e..c1eb16fdd5f 100644 --- a/Build/source/texk/mendexk/ChangeLog +++ b/Build/source/texk/mendexk/ChangeLog @@ -1,3 +1,8 @@ +2014-06-25 Peter Breitenlohner <peb@mppmu.mpg.de> + + * main.c: Drop definition of TL_VERSION. + * configure.ac: Use ../../version.ac to AC_DEFINE([TL_VERSION]). + 2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. diff --git a/Build/source/texk/mendexk/Makefile.in b/Build/source/texk/mendexk/Makefile.in index 7690edaa4b9..c85ae449d1f 100644 --- a/Build/source/texk/mendexk/Makefile.in +++ b/Build/source/texk/mendexk/Makefile.in @@ -105,7 +105,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../../version.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/mendexk/c-auto.in b/Build/source/texk/mendexk/c-auto.in index b8852321593..2503301fe2f 100644 --- a/Build/source/texk/mendexk/c-auto.in +++ b/Build/source/texk/mendexk/c-auto.in @@ -133,6 +133,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Define to the current TeX Live version string. */ +#undef TL_VERSION + /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 diff --git a/Build/source/texk/mendexk/configure b/Build/source/texk/mendexk/configure index f0d03a1e1d6..42e2e441646 100755 --- a/Build/source/texk/mendexk/configure +++ b/Build/source/texk/mendexk/configure @@ -12912,6 +12912,11 @@ fi ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" + + +$as_echo "#define TL_VERSION \"TeX Live 2015/dev\"" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C99 variadic macros are supported" >&5 $as_echo_n "checking if C99 variadic macros are supported... " >&6; } if ${kpse_cv_have___VA_ARGS__+:} false; then : diff --git a/Build/source/texk/mendexk/configure.ac b/Build/source/texk/mendexk/configure.ac index 63d76c1a2a3..70587df4e64 100644 --- a/Build/source/texk/mendexk/configure.ac +++ b/Build/source/texk/mendexk/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -17,6 +17,10 @@ KPSE_COMMON([mendexk], [no-define]) AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) +m4_include([../../version.ac])[] dnl define tex_live_version +AC_DEFINE([TL_VERSION], ["TeX Live tex_live_version()"], + [Define to the current TeX Live version string.]) + AC_CACHE_CHECK([if C99 variadic macros are supported], [kpse_cv_have___VA_ARGS__], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> diff --git a/Build/source/texk/mendexk/main.c b/Build/source/texk/mendexk/main.c index 52a093e9353..e1f33ba3d15 100644 --- a/Build/source/texk/mendexk/main.c +++ b/Build/source/texk/mendexk/main.c @@ -20,7 +20,6 @@ char *styfile,*idxfile[256],indfile[256],*dicfile,logfile[256]; KpathseaSupportInfo kp_ist,kp_dict; #define VERSION "version 2.6f [14-Aug-2009]" -#define TL_VERSION "TeX Live 2014" int main(int argc, char **argv) { |