view src/pstoedit-5-use_gs_env.patch @ 5531:eae508c12529

Add build rule for build-octave (bug #49503). * src/build-octave.mk: Add new build rule for build-octave which can be used for cross-building binary packages that depend on Octave as a build tool. * dist-files.mk: Add new file to list. * index.html: Add new package to list. * src/of-communications.mk, src/of-image.mk, src/of-mapping.mk, src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk, src/of-windows.mk: Add optional dependency on build-octave. * configure.ac: Add new configure switch "--disable-system-octave" that is needed to build the build-octave package. * Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the default build tools and build it only if a package explicitly depends on it. Display warning about missing native Octave version only if necessary.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 08 Sep 2020 23:04:38 +0200
parents cc549d1865cb
children 8d61de83cf90
line wrap: on
line source

diff -ur pstoedit-3.70.orig/src/callgs.cpp pstoedit-3.70/src/callgs.cpp
--- pstoedit-3.70.orig/src/callgs.cpp	2016-07-27 13:04:53.173499210 -0400
+++ pstoedit-3.70/src/callgs.cpp	2016-07-27 13:56:54.686649091 -0400
@@ -364,7 +364,15 @@
 		} else {
 		    if (verbose) errstream<< "nothing found in gsview32.ini file - using find_gs to lookup latest version of Ghostscript in registry " << endl;
 			static char buf[1000];
-			if (find_gs(buf, sizeof(buf), 550 /* min ver*/ , getPstoeditsetDLLUsage() , gsregbase)) { 
+
+
+	                gstocall = getenv("GS");
+
+                        if(gstocall) {
+		                if (verbose)
+			                errstream << "GS is set to:" << gstocall << endl;
+
+                        } else if (find_gs(buf, sizeof(buf), 550 /* min ver*/ , getPstoeditsetDLLUsage() , gsregbase)) { 
 				if (verbose) {
 					(void)dumpgsvers(gsregbase);
 					if (getPstoeditsetDLLUsage()) errstream << "Latest GS DLL is " << buf << endl;