[Goodies-commits] r2322 - in thunar-thumbnailers/trunk: . raw-thumbnailer tex-thumbnailer

[Erlend Davidson]

Author: erland
Date: 2007-01-08 23:47:16 +0000 (Mon, 08 Jan 2007)
New Revision: 2322

Modified:
   thunar-thumbnailers/trunk/ChangeLog
   thunar-thumbnailers/trunk/README
   thunar-thumbnailers/trunk/configure.in.in
   thunar-thumbnailers/trunk/raw-thumbnailer/Makefile.am
   thunar-thumbnailers/trunk/tex-thumbnailer/Makefile.am
Log:
Updated readme with dependencies.
configure.in.in now checks for dependencies and conditionals.
Conditional installation of the tex and raw thumbnailers.

Modified: thunar-thumbnailers/trunk/ChangeLog
===================================================================
--- thunar-thumbnailers/trunk/ChangeLog	2007-01-08 21:56:10 UTC (rev 2321)
+++ thunar-thumbnailers/trunk/ChangeLog	2007-01-08 23:47:16 UTC (rev 2322)
@@ -3,6 +3,8 @@
 	* Added a raw image thumbnailer (raw-thumbnailer/) [Jens Luedicke]
 	* Corrected .desktop file in tex-thumbnailer to use only one key
 	* ImageMagick is now a hard dependency of thunar-thumbnailers (TryExec never mentions the convert binary now)
+	* Added check for ImageMagick in configure.in.in
+	* Added --enable-raw and --enable-tex options to configure, with conditional checking of dependencies and install
 
 
 2007-01-06	Erlend Davidson <E.R.M.Davidson at sms.ed.ac.uk>

Modified: thunar-thumbnailers/trunk/README
===================================================================
--- thunar-thumbnailers/trunk/README	2007-01-08 21:56:10 UTC (rev 2321)
+++ thunar-thumbnailers/trunk/README	2007-01-08 23:47:16 UTC (rev 2322)
@@ -12,10 +12,12 @@
 The following packages are required:
 
  - Thunar 0.5.1 or above
+ - ImageMagick
 
-These packages are optional, but highly recommended:
+These packages are required for some thumbnailers to work:
 
- - ImageMagick (for the eps-thumbnailer)
+ - Tetex (for the tex-thumbnailer)
+ - Dcraw (for the raw-thumbnailer)
 
 
 Installation

Modified: thunar-thumbnailers/trunk/configure.in.in
===================================================================
--- thunar-thumbnailers/trunk/configure.in.in	2007-01-08 21:56:10 UTC (rev 2321)
+++ thunar-thumbnailers/trunk/configure.in.in	2007-01-08 23:47:16 UTC (rev 2322)
@@ -39,7 +39,37 @@
 dnl *** Check for basic programs ***
 dnl ********************************
 AC_PROG_INSTALL()
+AC_PATH_PROG(CONVERT, convert)
+      if test -z "$CONVERT"; then
+      	 AC_MSG_ERROR([ImageMagick is required to build thunar-thumbnailers])
+      fi
 
+dnl *** check if we want raw image thumbnailing ***
+AC_ARG_ENABLE(enable-raw,
+   [ --enable-raw Enables thumbnailing of the Raw images used by some digital cameras (requires dcraw). ],
+   enable_raw=yes)
+if test "$enable_raw" = "yes"; then
+    dnl *** check to see if dcraw, needed for raw image thumbnailing, is on the path ***
+    AC_PATH_PROG(DCRAW, dcraw)
+        if test -z "$DCRAW"; then
+      	    AC_MSG_ERROR([Install dcraw before enabling raw image thumbnailing])
+        fi
+fi
+AM_CONDITIONAL(ENABLE_RAW, test "$enable_raw" = "yes")
+
+dnl *** check if we want latex thumbnailing ***
+AC_ARG_ENABLE(enable-tex,
+   [ --enable-tex Enables thumbnailing of latex and tex files (requires tetex). ],
+   enable_tex=yes)
+if test "$enable_tex" = "yes"; then
+    dnl *** check to see if latex, needed for tex thumbnailing, is on the path ***
+    AC_PATH_PROG(LATEX, latex)
+        if test -z "$LATEX"; then
+      	    AC_MSG_ERROR([Install tetex before enabling latex thumbnailing])
+        fi
+fi
+AM_CONDITIONAL(ENABLE_TEX, test "$enable_tex" = "yes")
+
 AC_OUTPUT([
 Makefile
 eps-thumbnailer/Makefile

Modified: thunar-thumbnailers/trunk/raw-thumbnailer/Makefile.am
===================================================================
--- thunar-thumbnailers/trunk/raw-thumbnailer/Makefile.am	2007-01-08 21:56:10 UTC (rev 2321)
+++ thunar-thumbnailers/trunk/raw-thumbnailer/Makefile.am	2007-01-08 23:47:16 UTC (rev 2322)
@@ -1,11 +1,15 @@
 # $Id: Makefile.am 2296 2007-01-03 11:30:08Z benny $
 
-libexec_SCRIPTS =							\
-	raw-thumbnailer
+if ENABLE_RAW
+    libexec_SCRIPTS=raw-thumbnailer
+endif
 
 desktopdir = $(datadir)/thumbnailers
-desktop_in_files =							\
-	raw-thumbnailer.desktop.in
+
+if ENABLE_RAW
+    desktop_in_files=raw-thumbnailer.desktop.in
+endif
+
 %.desktop: %.desktop.in
 	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)

Modified: thunar-thumbnailers/trunk/tex-thumbnailer/Makefile.am
===================================================================
--- thunar-thumbnailers/trunk/tex-thumbnailer/Makefile.am	2007-01-08 21:56:10 UTC (rev 2321)
+++ thunar-thumbnailers/trunk/tex-thumbnailer/Makefile.am	2007-01-08 23:47:16 UTC (rev 2322)
@@ -1,11 +1,15 @@
 # $Id: Makefile.am 2296 2007-01-03 11:30:08Z benny $
 
-libexec_SCRIPTS =							\
-	tex-thumbnailer
+if ENABLE_TEX
+    libexec_SCRIPTS=tex-thumbnailer
+endif
 
 desktopdir = $(datadir)/thumbnailers
-desktop_in_files =							\
-	tex-thumbnailer.desktop.in
+
+if ENABLE_TEX
+    desktop_in_files=tex-thumbnailer.desktop.in
+endif
+
 %.desktop: %.desktop.in
 	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)