X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=configure.ac;h=f241f9ab8c3cfb9400ee075e008a323f0a24b4e4;hb=a71c2d133840d261ee229f6a2abe90aed9d0dee4;hp=103e02cf160e452e302d95904ba37f8c781c6bc6;hpb=73305037e28c5b252ffc5410eb5609d597088caf;p=evince.git

diff --git a/configure.ac b/configure.ac
index 103e02cf..f241f9ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ GNOME_COMPILE_WARNINGS
 GNOME_CXX_WARNINGS
 GNOME_DEBUG_CHECK
 
-ALL_LINGUAS="be bg bn ca cs da de el en_CA en_GB es et eu fi fr gl gu he hi hu id it ja ko ku lt nb ne nl no pa pl pt pt_BR ro ru rw sk sq sr sr@Latn sv th tr uk wa zh_CN zh_TW"
+ALL_LINGUAS="be bg bn ca cs cy da de el en_CA en_GB es et eu fa fi fr gl gu he hi hu id it ja ko ku lt mk nb ne nl no pa pl pt pt_BR ro ru rw sk sq sr sr@Latn sv th tr uk vi wa zh_CN zh_TW"
 
 AM_GLIB_GNU_GETTEXT
 
@@ -43,7 +43,7 @@ dnl Check dependencies
 # SHELL_CFLAGS     for shell implementation.
 # SHELL_LIBS
 
-POPPLER_REQUIRED=0.4.1
+POPPLER_REQUIRED=0.5.0
 DBUS_GLIB_REQUIRED=0.33
 GTK_REQUIRED=2.6.0
 LIBGNOMEUI_REQUIRED=2.6.0
@@ -137,6 +137,15 @@ dnl for backtrace()
 AC_CHECK_HEADERS([execinfo.h])
 
 dnl ================== ggv checks ===================================================
+AC_ARG_ENABLE(ps,
+  	[AC_HELP_STRING([--disable-ps], [Compile without PostScript backend])],enable_ps=$enableval,enable_ps="yes")
+
+if test x$enable_ps = xyes; then
+ 	AC_DEFINE([ENABLE_PS], [1], [Enable support for PostScript files.])
+fi 
+
+AM_CONDITIONAL(ENABLE_PS, test x$enable_ps = xyes)
+if test x$enable_ps = xyes; then
 AC_ARG_WITH(gs-pkg,
             [  --with-gs=dir       Directory Where GhostScript package is installed.])
 
@@ -162,6 +171,7 @@ fi
 AA_PARMS="-sDEVICE=x11alpha -dNOPLATFONTS"
 AC_DEFINE_UNQUOTED(ALPHA_PARAMS, "$AA_PARMS", [Anti-aliasing parameters for Ghostscript.])
 AC_MSG_RESULT(Antialiasing parameters for Ghostscript: $AA_PARMS)
+fi
 dnl ======================== End of ggv checks =================================
 
 dnl ================== tiff checks ===================================================
@@ -269,28 +279,21 @@ dnl ================== End of pixbuf checks ====================================
 dnl ================== comic book checks ===================================================
  
 AC_ARG_ENABLE(comics,
- 	[AC_HELP_STRING([--enable-comics], [Compile with support for comic book archives])],enable_comics=yes,enable_comics=no)
+ 	[AC_HELP_STRING([--enable-comics], [Compile with support for comic book archives])],enable_comics="$enableval",enable_comics=no)
 if test "x$enable_comics" = "xyes"; then
 	AC_DEFINE([ENABLE_COMICS], [1], [Enable support for comics.])
-
 fi 
 AM_CONDITIONAL(ENABLE_COMICS, test x$enable_comics = xyes)
 
-AC_PATH_PROG(UPDATE_MIME_DB, update-mime-database, no)
-AC_SUBST(UPDATE_MIME_DB)
-
-AC_ARG_ENABLE(update-mimedb,
-   AC_HELP_STRING([--disable-update-mimedb],
-                   [disable the update-mime-database after install [default=no]]),,
-    enable_update_mimedb=yes)
-AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
-
 dnl ================== End of comic book checks ============================================
 
 dnl =================== Mime types list ====================================================
 
-EVINCE_MIME_TYPES="application/pdf;application/postscript;application/x-gzpostscript"
+EVINCE_MIME_TYPES="application/pdf"
 
+if test "x$disable_ps" = "xno" ; then
+	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/postscript;application/x-gzpostscript"
+fi
 if test "x$enable_dvi" = "xyes"; then
 	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/x-dvi"
 fi
@@ -301,7 +304,7 @@ if test "x$enable_tiff" = "xyes"; then
 	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;image/tiff"
 fi
 if test "x$enable_comics" = "xyes"; then
-	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/cbr;application/cbz"
+	EVINCE_MIME_TYPES="$EVINCE_MIME_TYPES;application/x-cbr;application/x-cbz"
 fi
 AC_SUBST(EVINCE_MIME_TYPES)