evince r3002 - in trunk: . backend/ps

[carlosgc svn gnome org]

Author: carlosgc
Date: Sat Apr 12 11:39:07 2008
New Revision: 3002
URL: http://svn.gnome.org/viewvc/evince?rev=3002&view=rev

Log:
2008-04-12  Carlos Garcia Campos  <carlosgc gnome org>

	* configure.ac:
	* backend/ps/Makefile.am:

	Remove gs stuff from ps backend.


Removed:
   trunk/backend/ps/gsdefaults.c
   trunk/backend/ps/gsdefaults.h
   trunk/backend/ps/gsio.c
   trunk/backend/ps/gsio.h
   trunk/backend/ps/gstypes.h
   trunk/backend/ps/ps-document.c
   trunk/backend/ps/ps-document.h
   trunk/backend/ps/ps-interpreter.c
   trunk/backend/ps/ps-interpreter.h
   trunk/backend/ps/ps.c
   trunk/backend/ps/ps.h
Modified:
   trunk/ChangeLog
   trunk/backend/ps/Makefile.am
   trunk/configure.ac

Modified: trunk/backend/ps/Makefile.am
==============================================================================
--- trunk/backend/ps/Makefile.am	(original)
+++ trunk/backend/ps/Makefile.am	Sat Apr 12 11:39:07 2008
@@ -5,42 +5,21 @@
 	-I$(top_srcdir)/libdocument		\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"	\
 	$(BACKEND_CFLAGS)			\
+	$(SPECTRE_CFLAGS)			\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED)
 
-if HAVE_SPECTRE
-INCLUDES += $(SPECTRE_CFLAGS)
-endif
-
 backend_LTLIBRARIES = libpsdocument.la
 
-if HAVE_SPECTRE
 libpsdocument_la_SOURCES = 	\
 	ev-spectre.c		\
 	ev-spectre.h
-else
-libpsdocument_la_SOURCES = 	\
-	gsio.c			\
-	gsio.h			\
-	gstypes.h		\
-	ps.c			\
-	ps.h			\
-	ps-document.c		\
-	ps-document.h		\
-	ps-interpreter.c	\
-	ps-interpreter.h	\
-	gsdefaults.c		\
-	gsdefaults.h
-endif
 
 libpsdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libpsdocument_la_LIBADD = 				\
 	$(top_builddir)/libdocument/libevbackend.la	\
-	$(BACKEND_LIBS)
-
-if HAVE_SPECTRE
-libpsdocument_la_LIBADD += $(SPECTRE_LIBS)
-endif
+	$(BACKEND_LIBS)					\
+	$(SPECTRE_LIBS)
 
 backend_in_files = psdocument.evince-backend.in
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Apr 12 11:39:07 2008
@@ -238,42 +238,25 @@
 
 AM_CONDITIONAL(ENABLE_PDF, test x$enable_pdf = xyes)
 dnl ================== end of pdf checks ============================================
-SPECTRE_REQUIRED=0.2.0
 
 dnl libspectre (used by ps and dvi backends)
+SPECTRE_REQUIRED=0.2.0 
 PKG_CHECK_MODULES(SPECTRE, libspectre >= $SPECTRE_REQUIRED,have_spectre=yes,have_spectre=no)
 AM_CONDITIONAL(HAVE_SPECTRE, test x$have_spectre = xyes)
 if test "x$have_spectre" = "xyes"; then
-   AC_DEFINE([HAVE_SPECTRE], [1], [Have libpectre])
+   AC_DEFINE([HAVE_SPECTRE], [1], [Have libspectre])
 fi
 
 dnl ================== ps checks ====================================================
 AC_ARG_ENABLE(ps,
   	[AC_HELP_STRING([--disable-ps], [Compile without PostScript backend])],enable_ps=$enableval,enable_ps="yes")
 
-ps_backend=""
-if test x$enable_ps = xyes; then
-   AC_DEFINE([ENABLE_PS], [1], [Enable support for PostScript files.])
-
-   if test "x$have_spectre" = "xyes"; then
-      ps_backend="(libspectre)"
+if test "x$enable_ps" = "xyes"; then
+   if test "x$have_spectre = xyes"; then
+      AC_DEFINE([ENABLE_PS], [1], [Enable support for PostScript files.])
    else
-      dnl check for GS version
-      AC_MSG_CHECKING(for Ghostscript version...)
-      GS_VERSION=`gs --version | head -n 1 | sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-      AC_MSG_RESULT(found $GS_VERSION)
-      if test "$GS_VERSION" -lt "7"; then
-      	 AC_MSG_WARN([PS support is disabled since libspectre (version >= $SPECTRE_REQUIRED) or Ghostscript (version >= 7) are needed])
-	 enable_ps=no
-      else
-         AC_ARG_WITH(gs-aa-params,
-                     [AC_HELP_STRING([--with-gs-aa-params], [Define antialiasing params for ghostscript])],AA_PARAMS=$withval,
-		     AA_PARMS="-sDEVICE=x11alpha -dNOPLATFONTS -dGraphicsAlphaBits=4 -dTextAlphaBits=4 -dDOINTERPOLATE"
-		     )
-         AC_DEFINE_UNQUOTED(ALPHA_PARAMS, "$AA_PARMS", [Anti-aliasing parameters for Ghostscript.])
-         AC_MSG_RESULT(Antialiasing parameters for Ghostscript: $AA_PARMS)
-	 ps_backend="(gs)"
-      fi
+      enable_ps="no"
+      AC_MSG_WARN([PS support is disabled since libspectre (version >= $SPECTRE_REQUIRED) is needed])
    fi
 fi
 AM_CONDITIONAL(ENABLE_PS, test x$enable_ps = xyes)
@@ -484,7 +467,7 @@
 	Gtk-Doc Support....:  $enable_gtk_doc
 
 	PDF Backend........:  $enable_pdf
-	PostScript Backend.:  $enable_ps $ps_backend
+	PostScript Backend.:  $enable_ps
 	TIFF Backend.......:  $enable_tiff
 	DJVU Backend.......:  $enable_djvu
 	DVI Backend........:  $enable_dvi