summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-30 09:41:34 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-01-30 09:41:34 +0000
commit0428e986f06209f75419776b630d34e93080d57a (patch)
treec9c9d2568452d95542b1d6461187e7548be116b7 /Build/source/m4
parent27c9c2d0e7b7b11e85e6fbffb7ee0e0742d4daef (diff)
build system: Allow subdir-objects as required for Automake 1.14
git-svn-id: svn://tug.org/texlive/trunk@28989 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog5
-rw-r--r--Build/source/m4/kpse-common.m42
-rw-r--r--Build/source/m4/kpse-win32.m458
3 files changed, 53 insertions, 12 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 50abb999418..1008ea90a7c 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-common.m4: Enable subdir-objects.
+ * kpse-win32.m4: New macros KPSE_COND_* and KPSE_WIN32_CALL.
+
2013-01-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-icu-flags.m4: Remove KPSE_ICU_XETEX_FLAGS since XeTeX can
diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4
index 983bd0610cc..08ac909e465 100644
--- a/Build/source/m4/kpse-common.m4
+++ b/Build/source/m4/kpse-common.m4
@@ -210,7 +210,7 @@ eval LIBS=\"$[]AS_TR_CPP($1)_LIBS \$LIBS\"
AC_DEFUN([KPSE_BASIC], [dnl Remember PACKAGE-NAME as Kpse_Package (for future messages)
m4_define([Kpse_Package], [$1])
dnl
-AM_INIT_AUTOMAKE([foreign silent-rules]m4_ifval([$2], [ $2]))
+AM_INIT_AUTOMAKE([foreign silent-rules subdir-objects]m4_ifval([$2], [ $2]))
AM_MAINTAINER_MODE
dnl
dnl Check whether prototypes work.
diff --git a/Build/source/m4/kpse-win32.m4 b/Build/source/m4/kpse-win32.m4
index c98d9b80d03..d6b19cc378f 100644
--- a/Build/source/m4/kpse-win32.m4
+++ b/Build/source/m4/kpse-win32.m4
@@ -1,5 +1,5 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -10,16 +10,52 @@
# KPSE_CHECK_WIN32
# ----------------
# Check for WIN32 and distinguish between MINGW32 and native.
-AC_DEFUN([KPSE_CHECK_WIN32],
-[AC_CACHE_CHECK([for native WIN32 or MINGW32],
- [kpse_cv_have_win32],
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef WIN32
+AC_DEFUN([KPSE_CHECK_WIN32], [dnl
+AC_CACHE_CHECK([for native WIN32 or MINGW32],
+ [kpse_cv_have_win32],
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef WIN32
choke me
-#endif]], [[]])],
- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef __MINGW32__
+#endif]], [[]])],
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef __MINGW32__
choke me
-#endif]], [[]])],
- [kpse_cv_have_win32=mingw32],
- [kpse_cv_have_win32=native])],
- [kpse_cv_have_win32=no])])
+#endif]], [[]])],
+ [kpse_cv_have_win32=mingw32],
+ [kpse_cv_have_win32=native])],
+ [kpse_cv_have_win32=no])])
]) # KPSE_CHECK_WIN32
+
+# KPSE_COND_WIN32
+# ---------------
+# Define the conditional WIN32.
+AC_DEFUN([KPSE_COND_WIN32], [dnl
+AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
+AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+]) # KPSE_COND_WIN32
+
+# KPSE_COND_MINGW32
+# ---------------
+# Define the conditional MINGW32.
+AC_DEFUN([KPSE_COND_MINGW32], [dnl
+AC_REQUIRE([KPSE_COND_WIN32])[]dnl
+AM_CONDITIONAL([MINGW32], [test "x$kpse_cv_have_win32" = xmingw32])
+]) # KPSE_COND_MINGW32
+
+# KPSE_COND_WIN32_WRAP
+# ---------------
+# Define the conditional MINGW32.
+AC_DEFUN([KPSE_COND_WIN32_WRAP], [dnl
+AC_REQUIRE([KPSE_COND_WIN32])[]dnl
+AM_CONDITIONAL([WIN32_WRAP],
+ [test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"])
+]) # KPSE_COND_WIN32_WRAP
+
+# KPSE_WIN32_CALL
+# ---------------
+# Create a callexe.c symlink.
+AC_DEFUN([KPSE_WIN32_CALL], [dnl
+AC_REQUIRE([KPSE_COND_WIN32])[]dnl
+AM_CONDITIONAL([WIN32_CALL],
+ [test -r "$srcdir/../texlive/w32_wrapper/callexe.c"])
+AM_COND_IF([WIN32],
+ [AC_CONFIG_LINKS([callexe.c:../texlive/w32_wrapper/callexe.c])])
+]) # KPSE_WIN32_CALL