GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit 05ea1343 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

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

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
parent 3463d3f6
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>
* app/gegl/gimpoperationtilesource.c
......
......@@ -982,6 +982,8 @@ AC_SUBST(LIBTIFF)
# Check for libjpeg
###################
jpeg_ok=no
AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support])
if test "x$with_libjpeg" != xno && test -z "$LIBJPEG"; then
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.])
fi
AC_SUBST(JPEG)
AM_CONDITIONAL(BUILD_JPEG, test "x$jpeg_ok" = xyes)
AC_SUBST(LIBJPEG)
## 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
AM_CONDITIONAL(BUILD_XJT, test "x$jpeg_ok" = xyes && test "x$os_win32" = xno)
......
......@@ -8,6 +8,10 @@ if BUILD_HELPBROWSER
helpbrowser = helpbrowser
endif
if BUILD_JPEG
jpeg = jpeg
endif
if BUILD_PRINT
print = print
endif
......@@ -60,7 +64,7 @@ SUBDIRS = \
$(helpbrowser) \
ifscompose \
imagemap \
jpeg \
$(jpeg) \
maze \
metadata \
pagecurl \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment