Mercurial > hg > octave-nkf

diff acinclude.m4 @ 9865:763906db555e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
acinclude.m4: update gnuplot and ghostscript program checks for Windows
author Tatsu@Inspiron6000
date Wed, 25 Nov 2009 15:10:38 -0500
parents bb70d16cca3b
children ac69e6f4b33d
line wrap: on
line diff
--- 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)