callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure.in fixed --without-jpeg configure option (bug #507572).

Browse Source 
2008-01-06  Sven Neumann  <sven@gimp.org>

	* configure.in
	* plug-ins/Makefile.am: fixed --without-jpeg configure option
	(bug #507572).


svn path=/trunk/; revision=24548
This commit is contained in:
Sven Neumann
2008-01-06 12:09:38 +00:00
committed by Sven Neumann
parent 3463d3f649
commit 05ea134310
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-01-06 Sven Neumann <sven@gimp.org>
* configure.in
* plug-ins/Makefile.am: fixed --without-jpeg configure option
(bug #507572).
2008-01-06 Michael Natterer <mitch@gimp.org> 2008-01-06 Michael Natterer <mitch@gimp.org>
* app/gegl/gimpoperationtilesource.c * app/gegl/gimpoperationtilesource.c

5
configure.in
View File

@ -982,6 +982,8 @@ AC_SUBST(LIBTIFF)
# Check for libjpeg # Check for libjpeg
################### ###################
jpeg_ok=no
AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support]) AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support])
if test "x$with_libjpeg" != xno && test -z "$LIBJPEG"; then if test "x$with_libjpeg" != xno && test -z "$LIBJPEG"; then
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
@ -1016,9 +1018,10 @@ AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support])
*** --without-libjpeg to configure but you won't be able to use JPEGs then.]) *** --without-libjpeg to configure but you won't be able to use JPEGs then.])
fi fi
AC_SUBST(JPEG) AM_CONDITIONAL(BUILD_JPEG, test "x$jpeg_ok" = xyes)
AC_SUBST(LIBJPEG) AC_SUBST(LIBJPEG)
## xjt does build, but it is more confusing than useful on Win32, ## xjt does build, but it is more confusing than useful on Win32,
## as it wants to run tar, mv and bzip2, which seldom are available ## as it wants to run tar, mv and bzip2, which seldom are available
AM_CONDITIONAL(BUILD_XJT, test "x$jpeg_ok" = xyes && test "x$os_win32" = xno) AM_CONDITIONAL(BUILD_XJT, test "x$jpeg_ok" = xyes && test "x$os_win32" = xno)

6
plug-ins/Makefile.am
View File

@ -8,6 +8,10 @@ if BUILD_HELPBROWSER
helpbrowser = helpbrowser helpbrowser = helpbrowser
endif endif
if BUILD_JPEG
jpeg = jpeg
endif
if BUILD_PRINT if BUILD_PRINT
print = print print = print
endif endif
@ -60,7 +64,7 @@ SUBDIRS = \
$(helpbrowser) \ $(helpbrowser) \
ifscompose \ ifscompose \
imagemap \ imagemap \
jpeg \ $(jpeg) \
maze \ maze \
metadata \ metadata \
pagecurl \ pagecurl \