# HG changeset patch
# User Tatsu@Inspiron6000
# Date 1259179838 18000
# Node ID 763906db555e55d4d827fb4385b1bb1db515f3e7
# Parent  1355a606667e9d1820a1273aff61721d18ef23d3
acinclude.m4: update gnuplot and ghostscript program checks for Windows

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-25  Tatsuro MATSUOKA  <tmacchant@yahoo.co.jp>
+
+	* acinclude.m4 (OCTAVE_PROG_GNUPLOT): Don't check for pgnuplot or
+	pipe-gnuplot on Windows systems.  Set default to gnuplot for all
+	systems.
+	(OCTAVE_PROG_GHOSTSCRIPT): Check for gswin32c first on Windows
+	systems, then gs.
+
 2009-11-25  Rik <octave@nomad.inbox5.com>
 
 	* Makefile.am examples/Makefile.am liboctave/Makefile.am
diff --git a/acinclude.m4 b/acinclude.m4
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -623,16 +623,8 @@
 dnl Does gnuplot exist?
 dnl
 AC_DEFUN([OCTAVE_PROG_GNUPLOT], [
-case "$canonical_host_type" in
-  *-*-cygwin* | *-*-mingw32* | *-*-msdosmsvc)
-    gp_names="pgnuplot pipe-gnuplot gnuplot"
-    gp_default=pgnuplot
-  ;;
-  *)
-    gp_names=gnuplot
-    gp_default=gnuplot
-  ;;
-esac
+gp_names="gnuplot"
+gp_default="gnuplot"
 if test "$cross_compiling" = yes; then
   GNUPLOT="$gp_default"
   AC_MSG_RESULT(assuming $GNUPLOT exists on $canonical_host_type host)
@@ -681,11 +673,11 @@
 dnl OCTAVE_PROG_GHOSTSCRIPT
 AC_DEFUN([OCTAVE_PROG_GHOSTSCRIPT], [
   case "$canonical_host_type" in
-    *-*-cygwin* | *-*-mingw32* | *-*-msdosmsvc)
-      gs_names="gs gswin32"
+    *-*-mingw* | *-*-msdosmsvc)
+      gs_names="gswin32c gs"
     ;;
     *)
-      gs_names=gs
+      gs_names="gs"
     ;;
   esac
   AC_CHECK_PROGS(GHOSTSCRIPT, $gs_names)