diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-02-01 10:10:33 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-02-01 10:10:33 +0000 |
| commit | a01f17b2387fe42f2578c94d964f39a1e58a1e6f (patch) | |
| tree | 35caca6e3445de157ed263a649f7bc0e1718abbe /Build/source/m4/kpse-cxx-hack.m4 | |
| parent | 8e1591c3c2bdfbf2a10c43d6c91d9bebcdc39707 (diff) | |
build system: move zziplib back to libs/
git-svn-id: svn://tug.org/texlive/trunk@16891 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4/kpse-cxx-hack.m4')
| -rw-r--r-- | Build/source/m4/kpse-cxx-hack.m4 | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/Build/source/m4/kpse-cxx-hack.m4 b/Build/source/m4/kpse-cxx-hack.m4 index 9beec894270..17ec949b63b 100644 --- a/Build/source/m4/kpse-cxx-hack.m4 +++ b/Build/source/m4/kpse-cxx-hack.m4 @@ -1,6 +1,6 @@ # Public macros for the TeX Live (TL) tree. # Copyright (C) 2002 Olaf Weber <olaf@infovore.xs4all.nl> -# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holders # give unlimited permission to copy and/or distribute it, @@ -20,8 +20,7 @@ AC_DEFUN([KPSE_ENABLE_CXX_HACK], # KPSE_CXX_HACK() # --------------- -# Try statically linking C++ runtime library (g++ only) -# and define CXX_HACK_LIBS with required flags. +# Try statically linking C++ runtime library (g++ only). # Since Libtool reshuffles the argument list, we define CXXLD # as wrapper script appending these flags to g++ as invoked # by Libtool when linking progams (but not shared libraries). @@ -35,22 +34,18 @@ if test "x$GXX:$enable_cxx_runtime_hack" = xyes:yes; then fi if test "x$kpse_cv_cxx_hack" = xok; then CXXLD='$(top_builddir)/CXXLD.sh' - CXX_HACK_DEPS=$CXXLD - CXX_HACK_LIBS=$kpse_cv_cxx_flags cxxld_sh="#! ${CONFIG_SHELL-/bin/sh} # CXXLD.sh. Generated by configure. -set -- $CXX \"\$[]@\" $CXX_HACK_LIBS +set -- $CXX \"\$[]@\" $kpse_cv_cxx_flags echo \"\$[]0:\" \"\$[]@\" exec \"\$[]@\"" - AC_CONFIG_FILES([CXXLD.sh:README], - [echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh], - [cxxld_sh='$cxxld_sh']) + AC_CONFIG_COMMANDS([CXXLD.sh], + [echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh], + [cxxld_sh='$cxxld_sh']) else CXXLD='$(CXX)' fi AC_SUBST([CXXLD]) -AC_SUBST([CXX_HACK_DEPS]) -AC_SUBST([CXX_HACK_LIBS]) ]) # KPSE_CXX_HACK # _KPSE_CXX_HACK() |