diff options
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/texk/dvidvi/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/dvidvi/dvidvi.c | 1 | ||||
| -rw-r--r-- | Build/source/texk/dvipos/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/dvipos/Makefile.in | 20 | ||||
| -rw-r--r-- | Build/source/texk/dvipos/config.h.in (renamed from Build/source/texk/dvipos/c-auto.in) | 2 | ||||
| -rwxr-xr-x | Build/source/texk/dvipos/configure | 5 | ||||
| -rw-r--r-- | Build/source/texk/dvipos/configure.ac | 4 |
7 files changed, 25 insertions, 17 deletions
diff --git a/Build/source/texk/dvidvi/ChangeLog b/Build/source/texk/dvidvi/ChangeLog index d8d9d703bd0..4db194ce89e 100644 --- a/Build/source/texk/dvidvi/ChangeLog +++ b/Build/source/texk/dvidvi/ChangeLog @@ -1,3 +1,7 @@ +2015-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * dvidvi.c: Drop <kpathsea/config.h> (isascii via KPSE_COMMON). + 2015-04-17 Peter Breitenlohner <peb@mppmu.mpg.de> * dvidvi.c: #include <kpathsea/config.h> (for isascii). diff --git a/Build/source/texk/dvidvi/dvidvi.c b/Build/source/texk/dvidvi/dvidvi.c index e1655d46379..cc49995750a 100644 --- a/Build/source/texk/dvidvi/dvidvi.c +++ b/Build/source/texk/dvidvi/dvidvi.c @@ -64,7 +64,6 @@ void error(const char *); #endif #ifdef KPATHSEA -#include <kpathsea/config.h> #include <kpathsea/c-fopen.h> #define READBIN FOPEN_RBIN_MODE #ifdef VMS diff --git a/Build/source/texk/dvipos/ChangeLog b/Build/source/texk/dvipos/ChangeLog index 06576e3d7ed..d48d1cee57a 100644 --- a/Build/source/texk/dvipos/ChangeLog +++ b/Build/source/texk/dvipos/ChangeLog @@ -1,3 +1,9 @@ +2015-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * c-auto.in (removed): Unused, replaced ... + * config.h.in (new): ... by this. + * configure.ac: Adapted + 2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. diff --git a/Build/source/texk/dvipos/Makefile.in b/Build/source/texk/dvipos/Makefile.in index 042863aa686..551a7d9adfb 100644 --- a/Build/source/texk/dvipos/Makefile.in +++ b/Build/source/texk/dvipos/Makefile.in @@ -107,7 +107,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = c-auto.h +CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" @@ -194,7 +194,7 @@ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man1_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)c-auto.in + $(LISP)config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -216,7 +216,7 @@ CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \ - $(srcdir)/c-auto.in $(top_srcdir)/../../build-aux/compile \ + $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/config.guess \ $(top_srcdir)/../../build-aux/config.sub \ $(top_srcdir)/../../build-aux/depcomp \ @@ -380,7 +380,7 @@ dvipos_SOURCES = \ LDADD = $(KPATHSEA_LIBS) dist_man1_MANS = dvipos.1 EXTRA_DIST = miktex.mak -all: c-auto.h +all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: @@ -419,20 +419,20 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): -c-auto.h: stamp-h1 +config.h: stamp-h1 @test -f $@ || rm -f stamp-h1 @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 -stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status c-auto.h -$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ distclean-hdr: - -rm -f c-auto.h stamp-h1 + -rm -f config.h stamp-h1 install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ @@ -796,7 +796,7 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(MANS) c-auto.h +all-am: Makefile $(PROGRAMS) $(MANS) config.h installdirs: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ diff --git a/Build/source/texk/dvipos/c-auto.in b/Build/source/texk/dvipos/config.h.in index 922c57cda9c..60c484e6ee7 100644 --- a/Build/source/texk/dvipos/c-auto.in +++ b/Build/source/texk/dvipos/config.h.in @@ -1,4 +1,4 @@ -/* c-auto.in. Generated from configure.ac by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID diff --git a/Build/source/texk/dvipos/configure b/Build/source/texk/dvipos/configure index 8c90100034a..4b1bb40fbf4 100755 --- a/Build/source/texk/dvipos/configure +++ b/Build/source/texk/dvipos/configure @@ -13462,8 +13462,7 @@ fi -ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" - +ac_config_headers="$ac_config_headers config.h" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5 $as_echo_n "checking for library containing floor... " >&6; } @@ -16002,7 +16001,7 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;; + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/Build/source/texk/dvipos/configure.ac b/Build/source/texk/dvipos/configure.ac index d81ef4fc39d..d1ad94aad9f 100644 --- a/Build/source/texk/dvipos/configure.ac +++ b/Build/source/texk/dvipos/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009-2015 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, @@ -15,7 +15,7 @@ AC_CONFIG_MACRO_DIR([../../m4]) dnl Common code for all programs using libkpathsea. KPSE_COMMON([dvipos]) -AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) +AC_CONFIG_HEADERS([config.h])[]dnl unused, to avoid zillions of -D's on command line AC_SEARCH_LIBS([floor], [m]) |