X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcsharpexec.m4;h=c907416ac5e6e740a739548bc7eb1cfb05d0113a;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=7813bd15c8f84895370163f3812f82b8bd713b28;hpb=eebfb61f448a11db04a2d5ccd96c1718cca7ef54;p=gnulib.git

diff --git a/m4/csharpexec.m4 b/m4/csharpexec.m4
index 7813bd15c..c907416ac 100644
--- a/m4/csharpexec.m4
+++ b/m4/csharpexec.m4
@@ -1,18 +1,19 @@
-# csharpexec.m4 serial 2 (gettext-0.15)
-dnl Copyright (C) 2003-2005 Free Software Foundation, Inc.
+# csharpexec.m4 serial 4
+dnl Copyright (C) 2003-2005, 2009-2013 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.
+# Checks for a C# execution engine.
 # gt_CSHARPEXEC or gt_CSHARPEXEC(testexecutable, its-directory)
+# Sets at most one of HAVE_ILRUN, HAVE_MONO, HAVE_CLIX.
 # Sets HAVE_CSHARPEXEC to nonempty if csharpexec.sh will work.
-
 AC_DEFUN([gt_CSHARPEXEC],
 [
   AC_REQUIRE([gt_CSHARP_CHOICE])
   AC_MSG_CHECKING([for C[#] program execution engine])
-  AC_EGREP_CPP(yes, [
+  AC_EGREP_CPP([yes], [
 #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
   yes
 #endif
@@ -21,8 +22,9 @@ AC_DEFUN([gt_CSHARPEXEC],
   pushdef([AC_MSG_CHECKING],[:])dnl
   pushdef([AC_CHECKING],[:])dnl
   pushdef([AC_MSG_RESULT],[:])dnl
-  AC_CHECK_PROG(HAVE_ILRUN_IN_PATH, ilrun, yes)
-  AC_CHECK_PROG(HAVE_MONO_IN_PATH, mono, yes)
+  AC_CHECK_PROG([HAVE_ILRUN_IN_PATH], [ilrun], [yes])
+  AC_CHECK_PROG([HAVE_MONO_IN_PATH], [mono], [yes])
+  AC_CHECK_PROG([HAVE_CLIX_IN_PATH], [clix], [yes])
   popdef([AC_MSG_RESULT])dnl
   popdef([AC_CHECKING])dnl
   popdef([AC_MSG_CHECKING])dnl
@@ -46,6 +48,26 @@ AC_DEFUN([gt_CSHARPEXEC],
           break
         fi
         ;;
+      sscli)
+        if test -n "$HAVE_CLIX_IN_PATH" \
+           ifelse([$1], , , [&& clix $2/$1 >/dev/null 2>/dev/null]); then
+          HAVE_CLIX=1
+          case $host_os in
+            cygwin* | mingw* | pw32*)
+              CLIX_PATH_VAR=PATH
+              ;;
+            darwin* | rhapsody*)
+              CLIX_PATH_VAR=DYLD_LIBRARY_PATH
+              ;;
+            *)
+              CLIX_PATH_VAR=LD_LIBRARY_PATH
+              ;;
+          esac
+          eval CLIX_PATH=\"\$CLIX_PATH_VAR\"
+          ac_result="clix"
+          break
+        fi
+        ;;
       no)
         HAVE_CSHARPEXEC=
         ac_result="no"
@@ -54,8 +76,11 @@ AC_DEFUN([gt_CSHARPEXEC],
     esac
   done
   AC_MSG_RESULT([$ac_result])
-  AC_SUBST(MONO_PATH)
-  AC_SUBST(MONO_PATH_SEPARATOR)
-  AC_SUBST(HAVE_ILRUN)
-  AC_SUBST(HAVE_MONO)
+  AC_SUBST([MONO_PATH])
+  AC_SUBST([MONO_PATH_SEPARATOR])
+  AC_SUBST([CLIX_PATH_VAR])
+  AC_SUBST([CLIX_PATH])
+  AC_SUBST([HAVE_ILRUN])
+  AC_SUBST([HAVE_MONO])
+  AC_SUBST([HAVE_CLIX])
 ])