diff options
| author | Bruno Haible <bruno@clisp.org> | 2005-05-03 10:46:59 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:12:33 +0200 |
| commit | d508cfe82c7accac0fcdae1645cab6050ea2bc46 (patch) | |
| tree | 688e79c9e63f72653f27e0c29e82f91cf869067c /gettext-tools/m4 | |
| parent | 96d79a2d0644b9740779c3fcdd5923b763fb98a9 (diff) | |
| download | external_gettext-d508cfe82c7accac0fcdae1645cab6050ea2bc46.zip external_gettext-d508cfe82c7accac0fcdae1645cab6050ea2bc46.tar.gz external_gettext-d508cfe82c7accac0fcdae1645cab6050ea2bc46.tar.bz2 | |
Protect against pnet installations with missing pnetlib.
Diffstat (limited to 'gettext-tools/m4')
| -rw-r--r-- | gettext-tools/m4/ChangeLog | 8 | ||||
| -rw-r--r-- | gettext-tools/m4/Makefile.am | 4 | ||||
| -rw-r--r-- | gettext-tools/m4/csharpexec.m4 | 11 |
3 files changed, 17 insertions, 6 deletions
diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog index ca819c4..52a713b 100644 --- a/gettext-tools/m4/ChangeLog +++ b/gettext-tools/m4/ChangeLog @@ -1,5 +1,13 @@ 2005-05-01 Bruno Haible <bruno@clisp.org> + * csharpexec-test.exe: New file. + * csharpexec.m4 (gt_CSHARPEXEC): Test whether the C# engine can execute + it. + * Makefile.am (examplesbuildaux_DATA, EXTRA_DIST): Add + csharpexec-test.exe. + +2005-05-01 Bruno Haible <bruno@clisp.org> + * csharpcomp.m4 (gt_CSHARPCOMP): Check that cscc can actually compile a trivial program. Reported by Pierre <pierre42d@9online.fr>. diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am index 9a7fd98..8fee92a 100644 --- a/gettext-tools/m4/Makefile.am +++ b/gettext-tools/m4/Makefile.am @@ -40,11 +40,11 @@ docdir = @docdir@ examplesbuildauxdir = $(docdir)/examples/build-aux examplesbuildaux_DATA = \ gcj.m4 javacomp.m4 javaexec.m4 \ - csharpcomp.m4 csharpexec.m4 + csharpcomp.m4 csharpexec.m4 csharpexec-test.exe # Generate this list with # find . -type f -name '*.m4' -printf '%f\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012' -EXTRA_DIST = README ChangeLog.0 \ +EXTRA_DIST = README ChangeLog.0 csharpexec-test.exe \ alloca.m4 \ allocsa.m4 \ backupfile.m4 \ diff --git a/gettext-tools/m4/csharpexec.m4 b/gettext-tools/m4/csharpexec.m4 index 999c8e1..7813bd1 100644 --- a/gettext-tools/m4/csharpexec.m4 +++ b/gettext-tools/m4/csharpexec.m4 @@ -1,10 +1,11 @@ -# csharpexec.m4 serial 1 (gettext-0.14) -dnl Copyright (C) 2003-2004 Free Software Foundation, Inc. +# csharpexec.m4 serial 2 (gettext-0.15) +dnl Copyright (C) 2003-2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. # Prerequisites of csharpexec.sh. +# gt_CSHARPEXEC or gt_CSHARPEXEC(testexecutable, its-directory) # Sets HAVE_CSHARPEXEC to nonempty if csharpexec.sh will work. AC_DEFUN([gt_CSHARPEXEC], @@ -29,7 +30,8 @@ AC_DEFUN([gt_CSHARPEXEC], case "$impl" in pnet) if test -n "$HAVE_ILRUN_IN_PATH" \ - && ilrun --version >/dev/null 2>/dev/null; then + && ilrun --version >/dev/null 2>/dev/null \ + ifelse([$1], , , [&& ilrun $2/$1 >/dev/null 2>/dev/null]); then HAVE_ILRUN=1 ac_result="ilrun" break @@ -37,7 +39,8 @@ AC_DEFUN([gt_CSHARPEXEC], ;; mono) if test -n "$HAVE_MONO_IN_PATH" \ - && mono --version >/dev/null 2>/dev/null; then + && mono --version >/dev/null 2>/dev/null \ + ifelse([$1], , , [&& mono $2/$1 >/dev/null 2>/dev/null]); then HAVE_MONO=1 ac_result="mono" break |