CVS libidn/gl/m4

[libidn-commit]

Update of /home/cvs/libidn/gl/m4
In directory dopio:/tmp/cvs-serv6375/gl/m4

Modified Files:
        gnulib-cache.m4 gnulib-comp.m4 
Added Files:
        csharp.m4 csharpcomp.m4 
Log Message:
Use csharpcomp-script from gnulib.

--- /home/cvs/libidn/gl/m4/gnulib-cache.m4      2005/09/19 15:59:17     1.2
+++ /home/cvs/libidn/gl/m4/gnulib-cache.m4      2005/12/02 14:22:11     1.3
@@ -14,10 +14,10 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 
--aux-dir=. --lgpl --libtool --macro-prefix=gl dummy error getopt strdup
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 
--aux-dir=. --lgpl --libtool --macro-prefix=gl csharpcomp-script dummy error 
getopt strdup
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_MODULES([dummy error getopt strdup])
+gl_MODULES([csharpcomp-script dummy error getopt strdup])
 gl_AVOID([])
 gl_SOURCE_BASE([gl])
 gl_M4_BASE([gl/m4])
--- /home/cvs/libidn/gl/m4/gnulib-comp.m4       2005/10/22 19:39:47     1.4
+++ /home/cvs/libidn/gl/m4/gnulib-comp.m4       2005/12/02 14:22:11     1.5
@@ -25,6 +25,7 @@
 AC_DEFUN([gl_INIT],
 [
 AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
+  gt_CSHARPCOMP
   gl_ERROR
   gl_GETOPT
   gl_FUNC_STRDUP
@@ -33,6 +34,7 @@
 # This macro records the list of files which have been installed by
 # gnulib-tool and may be removed by future gnulib-tool invocations.
 AC_DEFUN([gl_FILE_LIST], [
+  lib/csharpcomp.sh.in
   lib/dummy.c
   lib/error.c
   lib/error.h
@@ -43,6 +45,8 @@
   lib/gettext.h
   lib/strdup.c
   lib/strdup.h
+  m4/csharp.m4
+  m4/csharpcomp.m4
   m4/error.m4
   m4/getopt.m4
   m4/onceonly_2_57.m4

--- /home/cvs/libidn/gl/m4/csharp.m4    2005/12/02 14:22:11     NONE
+++ /home/cvs/libidn/gl/m4/csharp.m4    2005/12/02 14:22:11     1.1
# csharp.m4 serial 2 (gettext-0.14.2)
dnl Copyright (C) 2004-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.

# Sets CSHARP_CHOICE to the preferred C# implementation:
# 'pnet' or 'mono' or 'any' or 'no'.
AC_DEFUN([gt_CSHARP_CHOICE],
[
  AC_MSG_CHECKING([for preferred C[#] implementation])
  AC_ARG_ENABLE(csharp,
    [  --enable-csharp[[=IMPL]]  choose preferred C[#] implementation (pnet or 
mono)],
    [CSHARP_CHOICE="$enableval"],
    CSHARP_CHOICE=any)
  AC_SUBST(CSHARP_CHOICE)
  AC_MSG_RESULT([$CSHARP_CHOICE])
  case "$CSHARP_CHOICE" in
    pnet)
      AC_DEFINE([CSHARP_CHOICE_PNET], 1,
        [Define if pnet is the preferred C# implementation.])
      ;;
    mono)
      AC_DEFINE([CSHARP_CHOICE_MONO], 1,
        [Define if mono is the preferred C# implementation.])
      ;;
  esac
])
--- /home/cvs/libidn/gl/m4/csharpcomp.m4        2005/12/02 14:22:11     NONE
+++ /home/cvs/libidn/gl/m4/csharpcomp.m4        2005/12/02 14:22:11     1.1
# csharpcomp.m4 serial 5 (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.
# Sets HAVE_CSHARPCOMP to nonempty if csharpcomp.sh will work.

AC_DEFUN([gt_CSHARPCOMP],
[
  AC_REQUIRE([gt_CSHARP_CHOICE])
  AC_MSG_CHECKING([for C[#] compiler])
  HAVE_CSHARPCOMP=1
  pushdef([AC_MSG_CHECKING],[:])dnl
  pushdef([AC_CHECKING],[:])dnl
  pushdef([AC_MSG_RESULT],[:])dnl
  AC_CHECK_PROG(HAVE_CSCC_IN_PATH, cscc, yes)
  AC_CHECK_PROG(HAVE_MCS_IN_PATH, mcs, yes)
  AC_CHECK_PROG(HAVE_CSC_IN_PATH, csc, yes)
  popdef([AC_MSG_RESULT])dnl
  popdef([AC_CHECKING])dnl
  popdef([AC_MSG_CHECKING])dnl
  for impl in "$CSHARP_CHOICE" pnet mono sscli no; do
    case "$impl" in
      pnet)
        if test -n "$HAVE_CSCC_IN_PATH" \
           && cscc --version >/dev/null 2>/dev/null \
           && (
             # See if pnetlib is well installed.
             echo 'class ConfTest { static void Main() { } }' > conftest.cs
             cscc -o conftest.exe conftest.cs 2>/dev/null
             error=$?
             rm -f conftest.cs conftest.exe
             exit $error
            ); then
          HAVE_CSCC=1
          ac_result="cscc"
          break
        fi
        ;;
      mono)
        if test -n "$HAVE_MCS_IN_PATH" \
           && mcs --version >/dev/null 2>/dev/null; then
          HAVE_MCS=1
          ac_result="mcs"
          break
        fi
        ;;
      sscli)
        if test -n "$HAVE_CSC_IN_PATH" \
           && csc -help >/dev/null 2>/dev/null \
           && { if csc -help 2>/dev/null | grep -i chicken > /dev/null; then 
false; else true; fi; }; then
          HAVE_CSC=1
          ac_result="csc"
          break
        fi
        ;;
      no)
        HAVE_CSHARPCOMP=
        ac_result="no"
        break
        ;;
    esac
  done
  AC_MSG_RESULT([$ac_result])
  AC_SUBST(HAVE_CSCC)
  AC_SUBST(HAVE_MCS)
  AC_SUBST(HAVE_CSC)
])