ggv portability patches



With these patches, ggv builds and appears to function properly on systems which don't have /usr/include/paths.h and/or don't keep the gv executable in /usr/bin.

Index: ggv/acconfig.h
===================================================================
RCS file: /cvs/gnome/ggv/acconfig.h,v
retrieving revision 1.4
diff -u -r1.4 acconfig.h
--- acconfig.h	1998/06/11 00:30:33	1.4
+++ acconfig.h	1998/11/10 17:45:02
@@ -9,4 +9,5 @@
 #undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
 #undef HAVE_PROGRAM_INVOCATION_NAME
 #undef HAVE_DEVGTK
+#undef GS_PATH
 
Index: ggv/configure.in
===================================================================
RCS file: /cvs/gnome/ggv/configure.in,v
retrieving revision 1.22
diff -u -r1.22 configure.in
--- configure.in	1998/08/12 01:41:36	1.22
+++ configure.in	1998/11/10 17:45:02
@@ -19,6 +19,10 @@
 ALL_LINGUAS="fr ko pt"
 AM_GNU_GETTEXT
 
+AC_CHECK_HEADER(paths.h)
+AC_PATH_PROG(GS_PROG, gs)
+AC_DEFINE_UNQUOTED(GS_PATH, "$GS_PROG")
+
 AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
 
 AC_SUBST(CFLAGS)
Index: ggv/file.c
===================================================================
RCS file: /cvs/gnome/ggv/file.c,v
retrieving revision 1.3
diff -u -r1.3 file.c
--- file.c	1998/07/28 04:19:05	1.3
+++ file.c	1998/11/10 17:45:02
@@ -44,7 +44,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#ifdef HAVE_PATHS_H
 #include "paths.h"
+#endif
 #include <gtk/gtk.h>
 /*#include <X11/Intrinsic.h>*/
 
Index: ggv/gtkgs.c
===================================================================
RCS file: /cvs/gnome/ggv/gtkgs.c,v
retrieving revision 1.5
diff -u -r1.5 gtkgs.c
--- gtkgs.c	1998/08/03 15:08:56	1.5
+++ gtkgs.c	1998/11/10 17:45:04
@@ -6,6 +6,7 @@
  * Based on code by: Federico Mena (Quartic), Szekeres Istvan (Pista)
  */
 
+#include "config.h"
 #include <string.h>
 #include <signal.h>
 #include <gtk/gtk.h>
@@ -95,7 +96,7 @@
 	gs->gs_filename_raw = 0;
 	gs->gs_filename_dsc = 0;
 	gs->gs_filename_unc = 0;
-        gs->gs_interpreter = "/usr/bin/gs";
+        gs->gs_interpreter = GS_PATH;
 
         broken_pipe = FALSE;
         /* FIXME: */

-- 
brandon s. allbery	[os/2][linux][solaris][japh]	 allbery@kf8nh.apk.net
system administrator	     [WAY too many hats]	   allbery@ece.cmu.edu
electrical and computer engineering
carnegie mellon university			   (bsa@kf8nh is still valid.)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]