From 8fb9831f2e5e1dcf6fc44dff6b3b2297384954f7 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 12 Nov 2009 15:18:38 +0000 Subject: build system: disable cross compilation of xindy git-svn-id: svn://tug.org/texlive/trunk@15994 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/m4/kpse-setup.m4 | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'Build/source/m4') diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4 index fee70acb7cf..2579286c11a 100644 --- a/Build/source/m4/kpse-setup.m4 +++ b/Build/source/m4/kpse-setup.m4 @@ -75,6 +75,7 @@ KPSE_FOR_PKGS([libs], [m4_sinclude(kpse_TL[libs/]Kpse_Pkg[/ac/withenable.ac])]) # Define the list of libraries required from the TL tree (if any). # Options: # disable - do not build by default +# native - impossible to cross compile AC_DEFUN([KPSE_ENABLE_PROG], [m4_pushdef([Kpse_enable], m4_if(m4_index([ $3 ], [ disable ]), [-1], [yes], [no]))[]dnl AC_ARG_ENABLE([$1], @@ -82,12 +83,21 @@ AC_ARG_ENABLE([$1], m4_if(Kpse_enable, [yes], [do not ])[build the $1 ]m4_ifval([$4], [($4) ])[package]))[]dnl -case $enable_[]AS_TR_SH($1) in #( - yes|no);; #( - *) enable_[]AS_TR_SH($1)=m4_if(Kpse_enable, [yes], [$enable_all_pkgs], [no]) +AS_CASE([$enable_[]AS_TR_SH($1)], + m4_if(m4_index([ $3 ], [ native ]), [-1], + [[yes|no], []], + [[yes], [AS_IF([test "x$cross_compiling" = xyes], + [AC_MSG_ERROR([Unable to cross compile $1])])], + [no], []]), + [m4_if(m4_index([ $3 ], [ native ]), [-1], , + [if test "x$cross_compiling" = xyes; then + enable_[]AS_TR_SH($1)=no + AC_MSG_NOTICE([Cross compiling -> `--disable-$1']) + else]) + enable_[]AS_TR_SH($1)=m4_if(Kpse_enable, [yes], [$enable_all_pkgs], [no]) AC_MSG_NOTICE([Assuming `--enable-$1=$enable_]AS_TR_SH($1)[']) - ac_configure_args="$ac_configure_args '--enable-$1=$enable_[]AS_TR_SH($1)'";; -esac + ac_configure_args="$ac_configure_args '--enable-$1=$enable_[]AS_TR_SH($1)'" + m4_if(m4_index([ $3 ], [ native ]), [-1], , [fi])]) m4_popdef([Kpse_enable])[]dnl m4_ifval([$2], [ test "x$enable_[]AS_TR_SH($1)" = xno || { -- cgit v1.2.3