gimp r27197 - in branches/gimp-2-6: . plug-ins

[neo svn gnome org]

Author: neo
Date: Thu Oct  9 16:36:04 2008
New Revision: 27197
URL: http://svn.gnome.org/viewvc/gimp?rev=27197&view=rev

Log:
2008-10-09  Sven Neumann  <sven gimp org>

	Merged from trunk:

	Bug 555697 â build fails if configured with --without-libjpeg
	
	* plug-ins/Makefile.am: applied patch from Simon Zilliken that
	disables the build of the PSD plug-in if JPEG support is 
disabled.



Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/plug-ins/Makefile.am

Modified: branches/gimp-2-6/plug-ins/Makefile.am
==============================================================================
--- branches/gimp-2-6/plug-ins/Makefile.am	(original)
+++ branches/gimp-2-6/plug-ins/Makefile.am	Thu Oct  9 16:36:04 2008
@@ -10,6 +10,7 @@
 
 if BUILD_JPEG
 file_jpeg = file-jpeg
+file_psd = file-psd
 endif
 
 if BUILD_PRINT
@@ -57,7 +58,7 @@
 	file-fli		\
 	$(file_ico)		\
 	$(file_jpeg)		\
-	file-psd		\
+	$(file_psd)		\
 	file-sgi		\
 	$(file_uri)		\
 	$(file_xjt)		\