Protect against pnet installations with missing pnetlib.

This commit is contained in:
Bruno Haible
2005-05-03 10:46:59 +00:00
parent 96d79a2d06
commit d508cfe82c
14 changed files with 46 additions and 16 deletions
+4
View File
@@ -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.
+1 -1
View File
@@ -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
+11
View File
@@ -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.
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,3 @@
EXTRA_DIST = \
nls.m4 po.m4 \
csharpcomp.m4 csharpexec.m4
csharpcomp.m4 csharpexec.m4 csharpexec-test.exe
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,3 @@
EXTRA_DIST = \
nls.m4 po.m4 \
csharpcomp.m4 csharpexec.m4
csharpcomp.m4 csharpexec.m4 csharpexec-test.exe
+8
View File
@@ -1,3 +1,11 @@
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
+2 -2
View File
@@ -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 \
+7 -4
View File
@@ -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