new configure flags
This commit is contained in:
John Cupitt
parent
a82fe054e6
commit
89dddb8858
|
|
@ -29,6 +29,7 @@
|
|||
- configure prints a summary of optional packages found at the end
|
||||
- im_lhisteq() checks for window too small
|
||||
- added invalidate callbacks
|
||||
- now tests for MagickWand before ImageMagick (thanks Adam)
|
||||
|
||||
25/1/08 started 7.14.0
|
||||
- bump all version numbers for new stable
|
||||
|
|
|
|||
49
configure.in
49
configure.in
|
|
@ -156,7 +156,8 @@ PKG_CHECK_MODULES(REQUIRED, glib-2.0 >= 2.6 gmodule-2.0 >= 2.4 libxml-2.0 gobjec
|
|||
PACKAGES_USED="$PACKAGES_USED glib-2.0 gmodule-2.0 libxml-2.0 gobject-2.0"
|
||||
|
||||
# option to eval without threads
|
||||
AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], [evaluate with threads (default: yes)]))
|
||||
AC_ARG_ENABLE(threads,
|
||||
AS_HELP_STRING([--enable-threads], [evaluate with threads (default: yes)]))
|
||||
|
||||
if test x"$enable_threads" != "xno"; then
|
||||
AC_DEFINE(HAVE_THREADS,1,[threaded evaluation])
|
||||
|
|
@ -169,7 +170,8 @@ fi
|
|||
|
||||
# we can wrap fftw3 and fftw2 ... but just look for fftw3, since we can do
|
||||
# that with pkg-config
|
||||
AC_ARG_WITH([fftw3], AS_HELP_STRING([--without-fftw3], [build without fftw3 (default: test)]))
|
||||
AC_ARG_WITH([fftw3],
|
||||
AS_HELP_STRING([--without-fftw3], [build without fftw3 (default: test)]))
|
||||
|
||||
if test x"$with_fftw3" != "xno"; then
|
||||
PKG_CHECK_MODULES(FFTW3, fftw3,
|
||||
|
|
@ -183,11 +185,19 @@ fi
|
|||
# ImageMagick ... detect attribute iteration too
|
||||
# Optionally look for GraphicsMagick instead ... use
|
||||
# --with-magickpackage=GraphicsMagick
|
||||
AC_ARG_WITH([magick], AS_HELP_STRING([--without-magick], [build without libMagic (default: test)]))
|
||||
AC_ARG_WITH([magickpackage], AS_HELP_STRING([--with-magickpackage], [magickpackage to use (default: ImageMagick)]))
|
||||
AC_ARG_WITH([magick],
|
||||
AS_HELP_STRING([--without-magick], [build without libMagic (default: test)]))
|
||||
AC_ARG_WITH([magickpackage],
|
||||
AS_HELP_STRING([--with-magickpackage],
|
||||
[magickpackage to use (default: MagickWand, ImageMagick)]))
|
||||
|
||||
# recent versions of ImageMagick have split parts of the library off to
|
||||
# MagickWand, so by default we test for that first
|
||||
if test x"$with_magickpackage" = "x"; then
|
||||
with_magickpackage=ImageMagick
|
||||
PKG_CHECK_MODULES(MAGICK_WAND, MagickWand,
|
||||
[with_magickpackage=MagickWand],
|
||||
[PKG_CHECK_MODULES(IMAGE_MAGICK, ImageMagick,
|
||||
[with_magickpackage=ImageMagick],)])
|
||||
fi
|
||||
|
||||
if test x"$with_magick" != "xno"; then
|
||||
|
|
@ -213,8 +223,8 @@ if test x"$with_magick" != "xno"; then
|
|||
fi
|
||||
|
||||
# liboil
|
||||
AC_ARG_WITH([liboil], AS_HELP_STRING([--without-liboil], [build without liboil
|
||||
(default: test)]))
|
||||
AC_ARG_WITH([liboil],
|
||||
AS_HELP_STRING([--without-liboil], [build without liboil (default: test)]))
|
||||
|
||||
if test x"$with_liboil" != "xno"; then
|
||||
PKG_CHECK_MODULES(LIBOIL, liboil-0.3,
|
||||
|
|
@ -227,7 +237,8 @@ if test x"$with_liboil" != "xno"; then
|
|||
fi
|
||||
|
||||
# lcms
|
||||
AC_ARG_WITH([lcms], AS_HELP_STRING([--without-lcms], [build without lcms (default: test)]))
|
||||
AC_ARG_WITH([lcms],
|
||||
AS_HELP_STRING([--without-lcms], [build without lcms (default: test)]))
|
||||
|
||||
if test x"$with_lcms" != "xno"; then
|
||||
PKG_CHECK_MODULES(LCMS, lcms,
|
||||
|
|
@ -240,7 +251,8 @@ if test x"$with_lcms" != "xno"; then
|
|||
fi
|
||||
|
||||
# OpenEXR
|
||||
AC_ARG_WITH([OpenEXR], AS_HELP_STRING([--without-OpenEXR], [build without OpenEXR (default: test)]))
|
||||
AC_ARG_WITH([OpenEXR],
|
||||
AS_HELP_STRING([--without-OpenEXR], [build without OpenEXR (default: test)]))
|
||||
|
||||
# require 1.2.2 since 1.2.1 has a broken ImfCloseTiledInputFile()
|
||||
if test x"$with_OpenEXR" != "xno"; then
|
||||
|
|
@ -254,7 +266,9 @@ if test x"$with_OpenEXR" != "xno"; then
|
|||
fi
|
||||
|
||||
# pangoft2
|
||||
AC_ARG_WITH([pangoft2], AS_HELP_STRING([--without-pangoft2], [build without pangoft2 (default: test)]))
|
||||
AC_ARG_WITH([pangoft2],
|
||||
AS_HELP_STRING([--without-pangoft2],
|
||||
[build without pangoft2 (default: test)]))
|
||||
|
||||
if test x"$with_pangoft2" != "xno"; then
|
||||
PKG_CHECK_MODULES(PANGOFT2, pangoft2,
|
||||
|
|
@ -284,7 +298,8 @@ FIND_JPEG(
|
|||
])
|
||||
|
||||
# look for PNG with pkg-config ... fall back to our tester
|
||||
AC_ARG_WITH([png], AS_HELP_STRING([--without-png], [build without libpng (default: test)]))
|
||||
AC_ARG_WITH([png],
|
||||
AS_HELP_STRING([--without-png], [build without libpng (default: test)]))
|
||||
|
||||
if test x"$with_png" != "xno"; then
|
||||
PKG_CHECK_MODULES(PNG, libpng,
|
||||
|
|
@ -299,7 +314,8 @@ if test x"$with_png" != "xno"; then
|
|||
fi
|
||||
|
||||
# libexif
|
||||
AC_ARG_WITH([libexif], AS_HELP_STRING([--without-libexif], [build without libexif (default: test)]))
|
||||
AC_ARG_WITH([libexif],
|
||||
AS_HELP_STRING([--without-libexif], [build without libexif (default: test)]))
|
||||
|
||||
if test x"$with_libexif" != "xno"; then
|
||||
PKG_CHECK_MODULES(EXIF, libexif >= 0.6,
|
||||
|
|
@ -337,7 +353,9 @@ else
|
|||
fi
|
||||
|
||||
# make python binding?
|
||||
AC_ARG_WITH([python], AS_HELP_STRING([--without-python], [build without Python bindings (default: test)]))
|
||||
AC_ARG_WITH([python],
|
||||
AS_HELP_STRING([--without-python],
|
||||
[build without Python bindings (default: test)]))
|
||||
|
||||
if test x"$with_python" != "xno"; then
|
||||
AM_PATH_PYTHON(2.2,,
|
||||
|
|
@ -371,7 +389,8 @@ fi
|
|||
|
||||
# make CImg wrapper? including C++ source causes link problems on some
|
||||
# platforms, so have an option to disable it
|
||||
AC_ARG_WITH([cimg], AS_HELP_STRING([--without-cimg], [build without CImg (default: with-cimg)]))
|
||||
AC_ARG_WITH([cimg],
|
||||
AS_HELP_STRING([--without-cimg], [build without CImg (default: with-cimg)]))
|
||||
|
||||
if test x"$with_cimg" != "xno"; then
|
||||
AM_CONDITIONAL(WITH_CIMG, true)
|
||||
|
|
@ -472,7 +491,7 @@ file import/export with libpng: $with_png
|
|||
file import/export with libtiff: $with_tiff
|
||||
file import/export with libjpeg: $with_jpeg
|
||||
use libexif to load/save JPEG metadata: $with_libexif
|
||||
video4linux found: $with_v4l
|
||||
video capture with v4l: $with_v4l
|
||||
build Python binding: $with_python
|
||||
build CImg wrapper: $with_cimg
|
||||
])
|
||||
|
|
|
|||
Loading…
Reference in New Issue