summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gettext-tools/ChangeLog4
-rw-r--r--gettext-tools/configure.ac2
-rw-r--r--gettext-tools/examples/ChangeLog11
-rwxr-xr-xgettext-tools/examples/hello-csharp-forms/autoclean.sh3
-rwxr-xr-xgettext-tools/examples/hello-csharp-forms/autogen.sh1
-rw-r--r--gettext-tools/examples/hello-csharp-forms/configure.ac4
-rw-r--r--gettext-tools/examples/hello-csharp-forms/m4/Makefile.am2
-rwxr-xr-xgettext-tools/examples/hello-csharp/autoclean.sh3
-rwxr-xr-xgettext-tools/examples/hello-csharp/autogen.sh3
-rw-r--r--gettext-tools/examples/hello-csharp/configure.ac4
-rw-r--r--gettext-tools/examples/hello-csharp/m4/Makefile.am2
-rw-r--r--gettext-tools/m4/ChangeLog8
-rw-r--r--gettext-tools/m4/Makefile.am4
-rw-r--r--gettext-tools/m4/csharpexec.m411
14 files changed, 46 insertions, 16 deletions
diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index d0b39d0..0f7cc63 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-01 Bruno Haible <bruno@clisp.org>
+
+ * configure.ac: Call gt_CSHARPEXEC with parameters.
+
2005-03-20 Bruno Haible <bruno@clisp.org>
* configure.ac: Test for field __names in struct __locale_struct.
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 61af08b..f48b18d 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -69,7 +69,7 @@ else
fi
AC_SUBST(BUILDCSHARP)
-gt_CSHARPEXEC
+gt_CSHARPEXEC([csharpexec-test.exe], [$srcdir/m4])
if test -n "$HAVE_CSHARPEXEC" && test $BUILDCSHARP = yes; then
TESTCSHARP=yes
else
diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 5df6c03..f88adb7 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,14 @@
+2005-05-01 Bruno Haible <bruno@clisp.org>
+
+ * hello-csharp/configure.ac, hello-csharp-forms/configure.ac: Call
+ gt_CSHARPEXEC with parameters.
+ * hello-csharp/m4/Makefile.am, hello-csharp-forms/m4/Makefile.am
+ (EXTRA_DIST): Add csharpexec-test.exe.
+ * hello-csharp/autogen.sh, hello-csharp-forms/autogen.sh: Also copy
+ m4/csharpexec-test.exe.
+ * hello-csharp/autoclean.sh, hello-csharp-forms/autoclean.sh: Also
+ remove m4/csharpexec-test.exe.
+
2005-04-11 Bruno Haible <bruno@clisp.org>
* gettext-0.14.4 released.
diff --git a/gettext-tools/examples/hello-csharp-forms/autoclean.sh b/gettext-tools/examples/hello-csharp-forms/autoclean.sh
index 73f33cf..068b28c 100755
--- a/gettext-tools/examples/hello-csharp-forms/autoclean.sh
+++ b/gettext-tools/examples/hello-csharp-forms/autoclean.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
# This file is in the public domain.
#
# Script for cleaning all autogenerated files.
@@ -15,6 +15,7 @@ rm -f po/remove-potcdate.sin
# Brought in by explicit copy.
rm -f m4/csharpcomp.m4
rm -f m4/csharpexec.m4
+rm -f m4/csharpexec-test.exe
rm -f csharpcomp.sh.in
rm -f csharpexec.sh.in
diff --git a/gettext-tools/examples/hello-csharp-forms/autogen.sh b/gettext-tools/examples/hello-csharp-forms/autogen.sh
index 7a699ee..3a99626 100755
--- a/gettext-tools/examples/hello-csharp-forms/autogen.sh
+++ b/gettext-tools/examples/hello-csharp-forms/autogen.sh
@@ -30,6 +30,7 @@ cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.s
cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpcomp.m4 m4/csharpcomp.m4
cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpexec.m4 m4/csharpexec.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpexec-test.exe m4/csharpexec-test.exe
cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharp.m4 m4/csharp.m4
cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/lib}/csharpcomp.sh.in csharpcomp.sh.in
cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/lib}/csharpexec.sh.in csharpexec.sh.in
diff --git a/gettext-tools/examples/hello-csharp-forms/configure.ac b/gettext-tools/examples/hello-csharp-forms/configure.ac
index 5ab88af..8841680 100644
--- a/gettext-tools/examples/hello-csharp-forms/configure.ac
+++ b/gettext-tools/examples/hello-csharp-forms/configure.ac
@@ -1,5 +1,5 @@
dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005 Free Software Foundation, Inc.
dnl This file is in the public domain.
dnl
dnl Configuration file - processed by autoconf.
@@ -18,7 +18,7 @@ fi
AC_SUBST(BUILDCSHARP)
dnl Check whether we can execute C# programs.
-gt_CSHARPEXEC
+gt_CSHARPEXEC([csharpexec-test.exe], [$srcdir/m4])
if test -n "$HAVE_CSHARPEXEC" && test $BUILDCSHARP = yes; then
TESTCSHARP=yes
else
diff --git a/gettext-tools/examples/hello-csharp-forms/m4/Makefile.am b/gettext-tools/examples/hello-csharp-forms/m4/Makefile.am
index 54e423d..de22d57 100644
--- a/gettext-tools/examples/hello-csharp-forms/m4/Makefile.am
+++ b/gettext-tools/examples/hello-csharp-forms/m4/Makefile.am
@@ -1,3 +1,3 @@
EXTRA_DIST = \
nls.m4 po.m4 \
- csharpcomp.m4 csharpexec.m4
+ csharpcomp.m4 csharpexec.m4 csharpexec-test.exe
diff --git a/gettext-tools/examples/hello-csharp/autoclean.sh b/gettext-tools/examples/hello-csharp/autoclean.sh
index 73f33cf..068b28c 100755
--- a/gettext-tools/examples/hello-csharp/autoclean.sh
+++ b/gettext-tools/examples/hello-csharp/autoclean.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# Example for use of GNU gettext.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
# This file is in the public domain.
#
# Script for cleaning all autogenerated files.
@@ -15,6 +15,7 @@ rm -f po/remove-potcdate.sin
# Brought in by explicit copy.
rm -f m4/csharpcomp.m4
rm -f m4/csharpexec.m4
+rm -f m4/csharpexec-test.exe
rm -f csharpcomp.sh.in
rm -f csharpexec.sh.in
diff --git a/gettext-tools/examples/hello-csharp/autogen.sh b/gettext-tools/examples/hello-csharp/autogen.sh
index 2b9c6ec..3a99626 100755
--- a/gettext-tools/examples/hello-csharp/autogen.sh
+++ b/gettext-tools/examples/hello-csharp/autogen.sh
@@ -1,6 +1,6 @@
#!/bin/sh
# Example for use of GNU gettext.
-# Copyright (C) 2003-2005-2004 Free Software Foundation, Inc.
+# Copyright (C) 2003-2005 Free Software Foundation, Inc.
# This file is in the public domain.
#
# Script for regenerating all autogenerated files.
@@ -30,6 +30,7 @@ cp -p ${GETTEXTSRCPODIR-$GETTEXT_TOPSRCDIR/gettext-runtime/po}/remove-potcdate.s
cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpcomp.m4 m4/csharpcomp.m4
cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpexec.m4 m4/csharpexec.m4
+cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharpexec-test.exe m4/csharpexec-test.exe
cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/m4}/csharp.m4 m4/csharp.m4
cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/lib}/csharpcomp.sh.in csharpcomp.sh.in
cp -p ${EXAMPLESCONFIGDIR-$GETTEXT_TOPSRCDIR/gettext-tools/lib}/csharpexec.sh.in csharpexec.sh.in
diff --git a/gettext-tools/examples/hello-csharp/configure.ac b/gettext-tools/examples/hello-csharp/configure.ac
index 980dd25..3c26f75 100644
--- a/gettext-tools/examples/hello-csharp/configure.ac
+++ b/gettext-tools/examples/hello-csharp/configure.ac
@@ -1,5 +1,5 @@
dnl Example for use of GNU gettext.
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005 Free Software Foundation, Inc.
dnl This file is in the public domain.
dnl
dnl Configuration file - processed by autoconf.
@@ -18,7 +18,7 @@ fi
AC_SUBST(BUILDCSHARP)
dnl Check whether we can execute C# programs.
-gt_CSHARPEXEC
+gt_CSHARPEXEC([csharpexec-test.exe], [$srcdir/m4])
if test -n "$HAVE_CSHARPEXEC" && test $BUILDCSHARP = yes; then
TESTCSHARP=yes
else
diff --git a/gettext-tools/examples/hello-csharp/m4/Makefile.am b/gettext-tools/examples/hello-csharp/m4/Makefile.am
index 54e423d..de22d57 100644
--- a/gettext-tools/examples/hello-csharp/m4/Makefile.am
+++ b/gettext-tools/examples/hello-csharp/m4/Makefile.am
@@ -1,3 +1,3 @@
EXTRA_DIST = \
nls.m4 po.m4 \
- csharpcomp.m4 csharpexec.m4
+ csharpcomp.m4 csharpexec.m4 csharpexec-test.exe
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
generated by cgit v1.1 at 2025-11-30 03:19:09 +0000