dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure, plug-ins: make libjpeg a hard dependency

This commit is contained in:
Michael Natterer 2013-11-02 22:32:18 +01:00
parent 57d291e130
commit 771293d402
2 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
configure.ac
View File

@ -1120,47 +1120,27 @@ AC_SUBST(TIFF_LIBS)
# Check for libjpeg # Check for libjpeg
################### ###################
AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support]) if test -z "$JPEG_LIBS"; then
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, ,
jpeg_ok=no AC_MSG_ERROR([JPEG library not found]))
if test "x$with_libjpeg" != xno && test -z "$JPEG_LIBS"; then AC_MSG_CHECKING([for jpeglib.h])
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, AC_PREPROC_IFELSE(
jpeg_ok=yes, [AC_LANG_SOURCE([[
[jpeg_ok="no (JPEG library not found)"])
if test "$jpeg_ok" = yes; then
AC_MSG_CHECKING([for jpeglib.h])
AC_PREPROC_IFELSE(
[AC_LANG_SOURCE([[
#include <stdio.h> #include <stdio.h>
#undef HAVE_STDDEF_H #undef HAVE_STDDEF_H
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
#undef PACKAGE #undef PACKAGE
#undef VERSION #undef VERSION
#include <jpeglib.h>]])], #include <jpeglib.h>]])],
[jpeg_ok=yes], AC_MSG_RESULT([yes]),
[jpeg_ok="no (Can't include jpeglib.h)"]) AC_MSG_ERROR([JPEG header file not found]))
AC_MSG_RESULT($jpeg_ok) AC_CHECK_LIB(jpeg, jpeg_save_markers,
if test "$jpeg_ok" = yes; then JPEG_LIBS='-ljpeg',
AC_CHECK_LIB(jpeg, jpeg_save_markers, AC_MSG_ERROR([JPEG library is too old]))
JPEG='jpeg$(EXEEXT)'; JPEG_LIBS='-ljpeg',
jpeg_ok="no (JPEG library is too old)")
else
jpeg_ok="no (JPEG header file not found)"
fi
fi
fi fi
if test "x$with_libjpeg" != xno && test -z "$JPEG_LIBS"; then MIME_TYPES="$MIME_TYPES;image/jpeg"
AC_MSG_ERROR([
*** Checks for JPEG library failed. You can build without it by passing
*** --without-libjpeg to configure but you won't be able to use JPEGs then.])
fi
if test "x$jpeg_ok" = xyes; then
MIME_TYPES="$MIME_TYPES;image/jpeg"
fi
AM_CONDITIONAL(BUILD_JPEG, test "x$jpeg_ok" = xyes)
AC_SUBST(JPEG_LIBS) AC_SUBST(JPEG_LIBS)
@ -2347,7 +2327,6 @@ Optional Plug-Ins:
Ghostscript: $have_gs Ghostscript: $have_gs
Help Browser: $have_webkit Help Browser: $have_webkit
LCMS: $have_lcms LCMS: $have_lcms
JPEG: $jpeg_ok
JPEG 2000: $have_jp2 JPEG 2000: $have_jp2
MNG: $have_libmng MNG: $have_libmng
OpenEXR: $have_openexr OpenEXR: $have_openexr

9
plug-ins/Makefile.am
View File

@ -8,11 +8,6 @@ if HAVE_OPENEXR
file_exr = file-exr file_exr = file-exr
endif endif
if BUILD_JPEG
file_jpeg = file-jpeg
file_psd = file-psd
endif
if BUILD_PRINT if BUILD_PRINT
print = print print = print
endif endif
@ -58,8 +53,8 @@ SUBDIRS = \
file-fits \ file-fits \
file-fli \ file-fli \
file-ico \ file-ico \
$(file_jpeg) \ file-jpeg \
$(file_psd) \ file-psd \
file-sgi \ file-sgi \
$(file_uri) \ $(file_uri) \
flame \ flame \