summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-24 15:19:37 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-24 15:19:37 +0000
commit51ebb9cb3b77f55e8f5b41f7a2dc12ca3d24f8a1 (patch)
treef4051e33af6f6489005e2a47fc5a6fda891ea8bb /Build/source/m4
parent481a11df4cbb82f94470352ea87dcc76d6ca19bd (diff)
new build system: towards completion
git-svn-id: svn://tug.org/texlive/trunk@12813 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/kpse-cxx-hack.m42
-rw-r--r--Build/source/m4/kpse-setup.m423
2 files changed, 23 insertions, 2 deletions
diff --git a/Build/source/m4/kpse-cxx-hack.m4 b/Build/source/m4/kpse-cxx-hack.m4
index 5a093fc2ec5..53163208aab 100644
--- a/Build/source/m4/kpse-cxx-hack.m4
+++ b/Build/source/m4/kpse-cxx-hack.m4
@@ -41,7 +41,7 @@ if test "x$kpse_cv_cxx_hack" = xok; then
set -- $CXX \"\$[]@\" $CXX_HACK_LIBS
echo \"\$[]0:\" \"\$[]@\"
exec \"\$[]@\""
- AC_CONFIG_FILES([CXXLD.sh:Makefile.in],
+ AC_CONFIG_FILES([CXXLD.sh:README],
[echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh],
[cxxld_sh='$cxxld_sh'])
else
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index a135351f0bb..ba91141435b 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -23,8 +23,29 @@ AC_ARG_ENABLE([all-pkgs],
AS_HELP_STRING([--disable-all-pkgs],
[do not build packages unless explicitly enabled]))[]dnl
test "x$enable_all_pkgs" = xno || enable_all_pkgs=yes
-KPSE_ENABLE_CXX_HACK
+AC_ARG_ENABLE([native-texlive-build],
+ AS_HELP_STRING([--disable-native-texlive-build],
+ [do not build for the TeX Live binary distribution]))[]dnl
+AS_CASE([$enable_native_texlive_build],
+ [yes | no], [:],
+ [enable_native_texlive_build=yes
+ ac_configure_args="$ac_configure_args '--enable-native-texlive-build'"])
+if test "x$enable_native_texlive_build" = xyes; then
+ AS_CASE([$enable_multiplatform],
+ [yes | no], [:],
+ [enable_multiplatform=yes
+ ac_configure_args="$ac_configure_args '--enable-multiplatform'"])
+ AS_CASE([$enable_cxx_runtime_hack],
+ [yes | no], [:],
+ [enable_cxx_runtime_hack=yes
+ ac_configure_args="$ac_configure_args '--enable-cxx-runtime-hack'"])
+ AS_CASE([$enable_shared],
+ [yes | no], [:],
+ [enable_shared=no
+ ac_configure_args="$ac_configure_args '--disable-shared'"])
+fi
KPSE_OPTIONS
+KPSE_ENABLE_CXX_HACK
KPSE_LIBS_PREPARE
KPSE_WEB2C_PREPARE
m4_sinclude(kpse_TL[ac/withenable.ac])