texk/dvipsk, texk/xdvik: Better handling of native subdirectory sqeeze

git-svn-id: svn://tug.org/texlive/trunk@34288 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 30 insertions, 41 deletions

diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 27349e335cd..b20cd49c960 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* {,squeeze/}Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
+
 2014-04-17  Karl Berry  <karl@tug.org>
 
 	* version 5.994 for TL'14.
diff --git a/Build/source/texk/dvipsk/Makefile.am b/Build/source/texk/dvipsk/Makefile.am
index dd3b9c9da74..cc631d67327 100644
--- a/Build/source/texk/dvipsk/Makefile.am
+++ b/Build/source/texk/dvipsk/Makefile.am
@@ -1,10 +1,8 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvipsk/
 ##
-## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
-ACLOCAL_AMFLAGS = -I ../../m4
-
 SUBDIRS = squeeze
 
 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DSHIFTLOWCHARS
diff --git a/Build/source/texk/dvipsk/Makefile.in b/Build/source/texk/dvipsk/Makefile.in
index ce436cc6afa..47582569388 100644
--- a/Build/source/texk/dvipsk/Makefile.in
+++ b/Build/source/texk/dvipsk/Makefile.in
@@ -631,7 +631,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../m4
 SUBDIRS = squeeze
 AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DSHIFTLOWCHARS
 AM_CFLAGS = $(WARNING_CFLAGS)
diff --git a/Build/source/texk/dvipsk/configure b/Build/source/texk/dvipsk/configure
index 01fd8ce9381..b2036e2af1b 100755
--- a/Build/source/texk/dvipsk/configure
+++ b/Build/source/texk/dvipsk/configure
@@ -14657,12 +14657,12 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
 fi
 
 
+ac_config_files="$ac_config_files Makefile"
 
 
-subdirs="$subdirs squeeze"
 
 
-ac_config_files="$ac_config_files Makefile"
+subdirs="$subdirs squeeze"
 
 
 
@@ -17014,10 +17014,12 @@ test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 if test "x$cross_compiling" = xyes; then :
-  cache_file=/dev/null
- ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \
- CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\
- CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'"
+  if test "x$cache_file" != x/dev/null; then :
+  cache_file=config.cache
+fi
+ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \
+CC='$BUILDCC' CFLAGS='$BUILDCFLAGS' \
+CPPFLAGS='$BUILDCPPFLAGS' LDFLAGS='$BUILDLDFLAGS'"
 fi
 
 # configure is writing to config.log, and then calls config.status.
diff --git a/Build/source/texk/dvipsk/configure.ac b/Build/source/texk/dvipsk/configure.ac
index 502fc9d32c6..3d2fe93033c 100644
--- a/Build/source/texk/dvipsk/configure.ac
+++ b/Build/source/texk/dvipsk/configure.ac
@@ -24,16 +24,9 @@ AC_SEARCH_LIBS([pow], [m])
 
 KPSE_KPATHSEA_FLAGS
 
-AC_CONFIG_SUBDIRS([squeeze])
-
 AC_CONFIG_FILES([Makefile])
 
 dnl The subdirectory squeeze must be configured for the build system.
-dnl When cross compiling, can not share the cache file with the subdirectory!
-AC_CONFIG_COMMANDS_POST([AS_IF([test "x$cross_compiling" = xyes],
-[cache_file=/dev/null
- ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \
- CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\
- CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'"])])
+KPSE_NATIVE_SUBDIRS([squeeze])
 
 AC_OUTPUT
diff --git a/Build/source/texk/dvipsk/squeeze/Makefile.am b/Build/source/texk/dvipsk/squeeze/Makefile.am
index 1c4400b838f..b75b324f128 100644
--- a/Build/source/texk/dvipsk/squeeze/Makefile.am
+++ b/Build/source/texk/dvipsk/squeeze/Makefile.am
@@ -1,10 +1,8 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvipsk/squeeze/
 ##
-## Copyright (C) 2009, 2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
-ACLOCAL_AMFLAGS = -I ../../../m4
-
 AM_CFLAGS = $(WARNING_CFLAGS)
 
 noinst_PROGRAMS = squeeze
diff --git a/Build/source/texk/dvipsk/squeeze/Makefile.in b/Build/source/texk/dvipsk/squeeze/Makefile.in
index 77679d6121f..8b811fae544 100644
--- a/Build/source/texk/dvipsk/squeeze/Makefile.in
+++ b/Build/source/texk/dvipsk/squeeze/Makefile.in
@@ -265,7 +265,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../../m4
 AM_CFLAGS = $(WARNING_CFLAGS)
 nodist_noinst_DATA = stamp-squeeze
 CLEANFILES = stamp-squeeze
diff --git a/Build/source/texk/xdvik/ChangeLog b/Build/source/texk/xdvik/ChangeLog
index 19318110fdd..b5af6fd0449 100644
--- a/Build/source/texk/xdvik/ChangeLog
+++ b/Build/source/texk/xdvik/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* squeeze/Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
+
 2014-05-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* m4/xdvi-xinput-2-1.m4: Change the default to disable 'smooth
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 265ef9f362a..e9061a8b3e3 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -18538,15 +18538,15 @@ _ACEOF
 XDVIK_VERSION=22.87
 
 
+ac_config_files="$ac_config_files Makefile tests/Makefile"
 
 
-subdirs="$subdirs squeeze"
+ac_config_files="$ac_config_files xdvi:xdvi-sh.in"
 
 
-ac_config_files="$ac_config_files Makefile tests/Makefile"
 
 
-ac_config_files="$ac_config_files xdvi:xdvi-sh.in"
+subdirs="$subdirs squeeze"
 
 
 
@@ -20902,10 +20902,12 @@ test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 if test "x$cross_compiling" = xyes; then :
-  cache_file=/dev/null
- ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \
- CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\
- CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'"
+  if test "x$cache_file" != x/dev/null; then :
+  cache_file=config.cache
+fi
+ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \
+CC='$BUILDCC' CFLAGS='$BUILDCFLAGS' \
+CPPFLAGS='$BUILDCPPFLAGS' LDFLAGS='$BUILDLDFLAGS'"
 fi
 
 # configure is writing to config.log, and then calls config.status.
diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac
index 775e153453b..9587d989975 100644
--- a/Build/source/texk/xdvik/configure.ac
+++ b/Build/source/texk/xdvik/configure.ac
@@ -295,18 +295,11 @@ AC_DEFINE_UNQUOTED([DEFAULT_PS2PDF_PATH], ["$with_default_ps2pdf_path"],
 XDVIK_VERSION=xdvik_version
 AC_SUBST([XDVIK_VERSION])
 
-AC_CONFIG_SUBDIRS([squeeze])
-
 AC_CONFIG_FILES([Makefile tests/Makefile])
 
 AC_CONFIG_FILES([xdvi:xdvi-sh.in], [chmod +x xdvi])
 
 dnl The subdirectory squeeze must be configured for the build system.
-dnl When cross compiling, can not share the cache file with the subdirectory!
-AC_CONFIG_COMMANDS_POST([AS_IF([test "x$cross_compiling" = xyes],
-[cache_file=/dev/null
- ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \
- CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\
- CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'"])])
+KPSE_NATIVE_SUBDIRS([squeeze])
 
 AC_OUTPUT
diff --git a/Build/source/texk/xdvik/squeeze/Makefile.am b/Build/source/texk/xdvik/squeeze/Makefile.am
index 5505f117aea..8f81ba88ee3 100644
--- a/Build/source/texk/xdvik/squeeze/Makefile.am
+++ b/Build/source/texk/xdvik/squeeze/Makefile.am
@@ -1,10 +1,8 @@
 ## Makefile.am for the TeX Live subdirectory texk/xdvik/squeeze/
 ##
-## Copyright (C) 2009, 2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
-ACLOCAL_AMFLAGS = -I ../../../m4
-
 AM_CFLAGS = $(WARNING_CFLAGS)
 
 noinst_PROGRAMS = squeeze
diff --git a/Build/source/texk/xdvik/squeeze/Makefile.in b/Build/source/texk/xdvik/squeeze/Makefile.in
index 77679d6121f..8b811fae544 100644
--- a/Build/source/texk/xdvik/squeeze/Makefile.in
+++ b/Build/source/texk/xdvik/squeeze/Makefile.in
@@ -265,7 +265,6 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../../m4
 AM_CFLAGS = $(WARNING_CFLAGS)
 nodist_noinst_DATA = stamp-squeeze
 CLEANFILES = stamp-squeeze