Improve csharpcomp module.

diff --git a/gettext-runtime/intl-csharp/ChangeLog b/gettext-runtime/intl-csharp/ChangeLog
index 82cd3be18d3432bbef386ea40bcc2f9921a2c54c..26fd7f18e808d8c8667987791021ca29b0c803d3 100644 (file)
--- a/gettext-runtime/intl-csharp/ChangeLog
+++ b/gettext-runtime/intl-csharp/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-04  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (CSHARPCOMPFLAGS): Use value set by csharpcomp.m4.
+
 2005-05-23  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.5 released.

diff --git a/gettext-runtime/intl-csharp/Makefile.am b/gettext-runtime/intl-csharp/Makefile.am
index 53678b3163c9d9a59cf184b8c333371901c6674e..67519bc2c418910d7475cf1b461231317173fc8f 100644 (file)
--- a/gettext-runtime/intl-csharp/Makefile.am
+++ b/gettext-runtime/intl-csharp/Makefile.am
@@ -27,7 +27,7 @@ docdir = @docdir@
 htmldir = $(docdir)
 
 CSHARPCOMP = $(SHELL) ../lib/csharpcomp.sh
-CSHARPCOMPFLAGS = -O -g
+CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 
 
 all-local: all-dll all-doc

diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog
index 70b9ecd88fd63a23aee98619a16f28e3e3d2f26a..24533438b5ded4c9275346a20854385cf5ba74ed 100644 (file)
--- a/gettext-tools/lib/ChangeLog
+++ b/gettext-tools/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-04  Bruno Haible  <bruno@clisp.org>
+
+       * csharpcomp.sh.in: Suffix for resources is .resources, not .resource.
+
 2005-12-04  Bruno Haible  <bruno@clisp.org>
 
        Cygwin portability.

diff --git a/gettext-tools/lib/csharpcomp.c b/gettext-tools/lib/csharpcomp.c
index 2344a996224c40fcaf0b97b20cb9924992bafd2e..47a58291986016b5bd570fdc26ba2ee87af68588 100644 (file)
--- a/gettext-tools/lib/csharpcomp.c
+++ b/gettext-tools/lib/csharpcomp.c
@@ -129,9 +129,9 @@ compile_csharp_using_pnet (const char * const *sources,
       for (i = 0; i < sources_count; i++)
        {
          const char *source_file = sources[i];
-         if (strlen (source_file) >= 9
-             && memcmp (source_file + strlen (source_file) - 9, ".resource",
-                        9) == 0)
+         if (strlen (source_file) >= 10
+             && memcmp (source_file + strlen (source_file) - 10, ".resources",
+                        10) == 0)
            {
              char *option = (char *) xallocsa (12 + strlen (source_file) + 1);
 
@@ -239,9 +239,9 @@ compile_csharp_using_mono (const char * const *sources,
       for (i = 0; i < sources_count; i++)
        {
          const char *source_file = sources[i];
-         if (strlen (source_file) >= 9
-             && memcmp (source_file + strlen (source_file) - 9, ".resource",
-                        9) == 0)
+         if (strlen (source_file) >= 10
+             && memcmp (source_file + strlen (source_file) - 10, ".resources",
+                        10) == 0)
            {
              char *option = (char *) xallocsa (10 + strlen (source_file) + 1);
 
@@ -417,9 +417,9 @@ compile_csharp_using_sscli (const char * const *sources,
       for (i = 0; i < sources_count; i++)
        {
          const char *source_file = sources[i];
-         if (strlen (source_file) >= 9
-             && memcmp (source_file + strlen (source_file) - 9, ".resource",
-                        9) == 0)
+         if (strlen (source_file) >= 10
+             && memcmp (source_file + strlen (source_file) - 10, ".resources",
+                        10) == 0)
            {
              char *option = (char *) xallocsa (10 + strlen (source_file) + 1);
 

diff --git a/gettext-tools/lib/csharpcomp.sh.in b/gettext-tools/lib/csharpcomp.sh.in
index da0d1ba2de1ef09d0885284c0d988b3254ab44ba..0a79d909c07e309eaf14c4e2d8f580fda3ea3dc5 100644 (file)
--- a/gettext-tools/lib/csharpcomp.sh.in
+++ b/gettext-tools/lib/csharpcomp.sh.in
@@ -113,7 +113,7 @@ while test $# != 0; do
       echo "csharpcomp: unknown option '$1'" 1>&2
       exit 1
       ;;
-    *.resource)
+    *.resources)
       options_cscc="$options_cscc -fresources="`echo "$1" | sed -e "$sed_quote_subst"`
       options_mcs="$options_mcs -resource:"`echo "$1" | sed -e "$sed_quote_subst"`
       options_csc="$options_csc -resource:"`echo "$1" | sed -e "$sed_quote_subst"`

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index e80342bd330bf1507047653237e067a5a474180c..9bdf2446e56f10394570c9adf1a068d90656c95d 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-04  Bruno Haible  <bruno@clisp.org>
+
+       * csharpcomp.m4 (gt_CSHARPCOMP): Also set CSHARPCOMPFLAGS.
+
 2005-11-24  Bruno Haible  <bruno@clisp.org>
 
        Cygwin portability.

diff --git a/gettext-tools/m4/csharpcomp.m4 b/gettext-tools/m4/csharpcomp.m4
index b107f9f55ac1b835612e791eb2857713cfc3966a..dab35a7852d0bcbd0cf3e21f1db36b0fd76b6433 100644 (file)
--- a/gettext-tools/m4/csharpcomp.m4
+++ b/gettext-tools/m4/csharpcomp.m4
@@ -1,12 +1,14 @@
-# csharpcomp.m4 serial 5 (gettext-0.15)
+# csharpcomp.m4 serial 6 (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 csharpcomp.sh.
+# Checks for a C# compiler.
+# Sets at most one of HAVE_CSCC, HAVE_MCS, HAVE_CSC.
 # Sets HAVE_CSHARPCOMP to nonempty if csharpcomp.sh will work.
-
+# Also sets CSHARPCOMPFLAGS.
 AC_DEFUN([gt_CSHARPCOMP],
 [
   AC_REQUIRE([gt_CSHARP_CHOICE])
@@ -67,4 +69,9 @@ AC_DEFUN([gt_CSHARPCOMP],
   AC_SUBST(HAVE_CSCC)
   AC_SUBST(HAVE_MCS)
   AC_SUBST(HAVE_CSC)
+  dnl Provide a default for CSHARPCOMPFLAGS.
+  if test -z "${CSHARPCOMPFLAGS+set}"; then
+    CSHARPCOMPFLAGS="-O -g"
+  fi
+  AC_SUBST(CSHARPCOMPFLAGS)
 ])

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index a76d9a48497549d6085d251d56b2f33838424681..f6ac94b67229c16dc00a564bc6a0227c9743153a 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-04  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (CSHARPCOMPFLAGS): Use value set by csharpcomp.m4.
+
 2005-11-29  Colin Watson  <cjwatson@ubuntu.com>
 
        * msggrep.c (invert_match): New variable.

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index c25e91a5f55641af5aaa2009c6d7b487107656df..3c4a075058300291fc56d2789ee975535240ae6a 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -87,7 +87,7 @@ GCJFLAGS = @GCJFLAGS@
 JAR = @JAR@
 JAVACOMP = $(SHELL) ../lib/javacomp.sh
 CSHARPCOMP = $(SHELL) ../lib/csharpcomp.sh
-CSHARPCOMPFLAGS = -O -g
+CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 
 
 # All programs deal with message lists.