Correct CLASSPATH_SEPARATOR on Cygwin.

diff --git a/gettext-tools/m4/javacomp.m4 b/gettext-tools/m4/javacomp.m4
index 967fd180db2812817d0c204de43bac145c87e981..4e4eae06965a3b8541898ed5bb22881542e3d187 100644 (file)
--- a/gettext-tools/m4/javacomp.m4
+++ b/gettext-tools/m4/javacomp.m4
@@ -58,6 +58,11 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gt_JAVACOMP],
 [
   ifelse([$2], [], [AC_REQUIRE([gt_JAVAEXEC])], [])
+  AC_EGREP_CPP(yes, [
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
+  yes
+#endif
+], CLASSPATH_SEPARATOR=';', CLASSPATH_SEPARATOR=':')
   source_version=$1
   test -n "$source_version" || {
     AC_MSG_ERROR([missing source-version argument to gt_@&t@JAVACOMP])
@@ -87,8 +92,8 @@ changequote([,])dnl
          > conftestver.class
        target_version=`{
          unset JAVA_HOME
-         echo "$as_me:__oline__: CLASSPATH=.:$CLASSPATH $CONF_JAVA conftestver" >&AS_MESSAGE_LOG_FD
-         CLASSPATH=.:$CLASSPATH $CONF_JAVA conftestver 2>&AS_MESSAGE_LOG_FD
+         echo "$as_me:__oline__: CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver" >&AS_MESSAGE_LOG_FD
+         CLASSPATH=.${CLASSPATH:+$CLASSPATH_SEPARATOR$CLASSPATH} $CONF_JAVA conftestver 2>&AS_MESSAGE_LOG_FD
        }`
        case "$target_version" in
          1.1 | 1.2 | 1.3 | 1.4 | 1.5 | 1.6) ;;
@@ -134,11 +139,6 @@ changequote([,])dnl
     }
   fi
   AC_MSG_CHECKING([for Java compiler])
-  AC_EGREP_CPP(yes, [
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  yes
-#endif
-], CLASSPATH_SEPARATOR=';', CLASSPATH_SEPARATOR=':')
   dnl
   dnl The support of GNU gcj for target-version and source-version:
   dnl

diff --git a/gettext-tools/m4/javaexec.m4 b/gettext-tools/m4/javaexec.m4
index 50dbec2410599d54d4917b84150d1d692b8951c5..4f3b087e62cc1e7a75a36e25a475b09d9bf5122c 100644 (file)
--- a/gettext-tools/m4/javaexec.m4
+++ b/gettext-tools/m4/javaexec.m4
@@ -1,4 +1,4 @@
-# javaexec.m4 serial 3 (gettext-0.15)
+# javaexec.m4 serial 4 (gettext-0.15)
 dnl Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -12,7 +12,7 @@ AC_DEFUN([gt_JAVAEXEC],
 [
   AC_MSG_CHECKING([for Java virtual machine])
   AC_EGREP_CPP(yes, [
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+#if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
   yes
 #endif
 ], CLASSPATH_SEPARATOR=';', CLASSPATH_SEPARATOR=':')