]> granicus.if.org Git - imagemagick/blobdiff - configure.ac
Revised comments about interpretation of the -quality value in coders/png.c
[imagemagick] / configure.ac
index 2fa60c722dc5dca8f0e04cd756c584844c75934a..5d52391e9714a0b9a5f156bc7ed692cfd2156711 100755 (executable)
@@ -517,6 +517,7 @@ fi
 # Enable support for OpenCL
 AX_OPENCL([C])
 CFLAGS="$CL_CFLAGS $CFLAGS"
+CPPFLAGS="$CL_CFLAGS $CPPFLAGS"
 LIBS="$CL_LIBS $LIBS"
 AC_SUBST(CL_CFLAGS)
 if test "$enable_opencl" != no; then
@@ -1284,7 +1285,7 @@ if test "$enable_delegate_build" != 'no'; then
     # Most delegates have includes in the same directory as the library, but not all...
     #
     # Includes
-    for dir in bzlib fftw fitz fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick png tiff/libtiff ttf/include wand webp wmf/include xml/include zlib; do
+    for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick mupdf png tiff/libtiff ttf/include wand webp wmf/include xml/include zlib; do
         if test -d "$builddir/$dir"; then
             CPPFLAGS="$CPPFLAGS -I$builddir/$dir"
         else
@@ -1295,7 +1296,7 @@ if test "$enable_delegate_build" != 'no'; then
     done
 
     # Libraries
-    for dir in bzlib fitz fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do
+    for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick mupdf png tiff/libtiff ttf/objs wand webp wmf/src xml zlib; do
     if test -d "$builddir/$dir/.libs"; then
         LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs"
     else
@@ -2006,50 +2007,6 @@ AC_SUBST(FREETYPE_LIBS)
 
 dnl ===========================================================================
 
-#
-# Check for FITZ delegate library.
-#
-AC_ARG_WITH(fitz,
-    [AC_HELP_STRING([--with-fitz],
-                    [enable FITZ support])],
-    [with_fitz=$withval],
-    [with_fitz='no'])
-
-if test "$with_fitz" != 'yes'; then
-    DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-fitz=$with_fitz "
-fi
-
-have_fitz='no'
-FITZ_LIBS=''
-if test "$with_fitz" != 'no'; then
-    AC_MSG_RESULT([-------------------------------------------------------------])
-    AC_MSG_CHECKING([for FITZ])
-    AC_MSG_RESULT([])
-    failed=0
-    passed=0
-    AC_CHECK_HEADER(fitz.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
-    AC_CHECK_LIB(fitz,fz_new_context,passed=`expr $passed + 1`,failed=`expr $failed + 1`,-lfitz $FREETYPE_LIBS)
-    AC_MSG_CHECKING([if FITZ package is complete])
-    if test $passed -gt 0; then
-        if test $failed -gt 0; then
-            AC_MSG_RESULT([no -- some components failed test])
-            have_fitz='no (failed tests)'
-        else
-            FITZ_LIBS='-lfitz'
-            LIBS="$FITZ_LIBS $LIBS"
-            AC_DEFINE(FITZ_DELEGATE,1,Define if you have FITZ library)
-            AC_MSG_RESULT([yes])
-            have_fitz='yes'
-        fi
-    else
-        AC_MSG_RESULT([no])
-    fi
-fi
-AM_CONDITIONAL(FITZ_DELEGATE,test "$have_fitz" = 'yes')
-AC_SUBST(FITZ_LIBS)
-
-dnl ===========================================================================
-
 #
 # Check for Ghostscript library or framework.
 #
@@ -2518,6 +2475,50 @@ AC_SUBST(LZMA_LIBS)
 
 dnl ===========================================================================
 
+#
+# Check for MUPDF delegate library.
+#
+AC_ARG_WITH(mupdf,
+    [AC_HELP_STRING([--with-mupdf],
+                    [enable MUPDF support])],
+    [with_mupdf=$withval],
+    [with_mupdf='no'])
+
+if test "$with_mupdf" != 'yes'; then
+    DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-mupdf=$with_mupdf "
+fi
+
+have_mupdf='no'
+MUPDF_LIBS=''
+if test "$with_mupdf" != 'no'; then
+    AC_MSG_RESULT([-------------------------------------------------------------])
+    AC_MSG_CHECKING([for MUPDF])
+    AC_MSG_RESULT([])
+    failed=0
+    passed=0
+    AC_CHECK_HEADER(mupdf/fitz.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+    AC_CHECK_LIB(mupdf,fz_new_context,passed=`expr $passed + 1`,failed=`expr $failed + 1`,-lmupdf $FREETYPE_LIBS)
+    AC_MSG_CHECKING([if MUPDF package is complete])
+    if test $passed -gt 0; then
+        if test $failed -gt 0; then
+            AC_MSG_RESULT([no -- some components failed test])
+            have_mupdf='no (failed tests)'
+        else
+            MUPDF_LIBS='-lmupdf'
+            LIBS="$MUPDF_LIBS $LIBS"
+            AC_DEFINE(MUPDF_DELEGATE,1,Define if you have MUPDF library)
+            AC_MSG_RESULT([yes])
+            have_mupdf='yes'
+        fi
+    else
+        AC_MSG_RESULT([no])
+    fi
+fi
+AM_CONDITIONAL(MUPDF_DELEGATE,test "$have_mupdf" = 'yes')
+AC_SUBST(MUPDF_LIBS)
+
+dnl ===========================================================================
+
 #
 # Check for the OpenEXR delegate library.
 #
@@ -3215,14 +3216,12 @@ AutotraceDecodeDelegateDefault='autotrace'
 BlenderDecodeDelegateDefault='blender'
 BZIPDelegateDefault='bzip2'
 BrowseDelegateDefault='xdg-open'
-CGMDecodeDelegateDefault='ralcgm'
 CatDelegateDefault='cat'
 DNGDecodeDelegateDefault='ufraw-batch'
 GVCDecodeDelegateDefault='dot'
 DVIDecodeDelegateDefault='dvips'
 EchoDelegateDefault='echo'
 EditorDelegateDefault='xterm'
-FIGDecodeDelegateDefault='fig2dev'
 ConvertDelegateDefault=`echo convert | sed ${configure_transform_name}`
 DisplayDelegateDefault=`echo display | sed ${configure_transform_name}`
 MogrifyDelegateDefault=`echo mogrify | sed ${configure_transform_name}`
@@ -3270,14 +3269,12 @@ AC_PATH_PROG(AutotraceDecodeDelegate, "$AutotraceDecodeDelegateDefault", "$Autot
 AC_PATH_PROG(BlenderDecodeDelegate, "$BlenderDecodeDelegateDefault", "$BlenderDecodeDelegateDefault")
 AC_PATH_PROG(BZIPDelegate, "$BZIPDelegateDefault", "$BZIPDelegateDefault")
 AC_PATH_PROGS(BrowseDelegate, "$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx, "$BrowseDelegateDefault")
-AC_PATH_PROG(CGMDecodeDelegate, "$CGMDecodeDelegateDefault", "$CGMDecodeDelegateDefault")
 AC_PATH_PROG(CatDelegate, "$CatDelegateDefault", "$CatDelegateDefault")
 AC_PATH_PROG(DNGDecodeDelegate, "$DNGDecodeDelegateDefault", "$DNGDecodeDelegateDefault")
 AC_PATH_PROG(GVCDecodeDelegate, "$GVCDecodeDelegateDefault", "$GVCDecodeDelegateDefault")
 AC_PATH_PROG(DVIDecodeDelegate, "$DVIDecodeDelegateDefault", "$DVIDecodeDelegateDefault")
 AC_PATH_PROG(EchoDelegate, "$EchoDelegateDefault", "$EchoDelegateDefault")
 AC_PATH_PROG(EditorDelegate, "$EditorDelegateDefault", "$EditorDelegateDefault")
-AC_PATH_PROG(FIGDecodeDelegate, "$FIGDecodeDelegateDefault", "$FIGDecodeDelegateDefault")
 AC_PATH_PROG(ConvertDelegate, "$ConvertDelegateDefault", "$ConvertDelegateDefault")
 AC_PATH_PROG(DisplayDelegate, "$DisplayDelegateDefault", "$DisplayDelegateDefault")
 AC_PATH_PROG(MogrifyDelegate, "$MogrifyDelegateDefault", "$MogrifyDelegateDefault")
@@ -3329,14 +3326,12 @@ MogrifyDelegate="${BIN_DIR}/${MogrifyDelegateDefault}"
 
 # Set delegate booleans
 have_ffmpeg='no'; if test "$MPEGDecodeDelegate" != "$MPEGDecodeDelegateDefault" ; then have_ffmpeg='yes'; fi
-have_fig2dev='no'    ; if test "$FIGDecodeDelegate" != "$FIGDecodeDelegateDefault" ; then have_fig2dev='yes'; fi
 have_gs='no'         ; if test "$PSDelegate" != "$PSDelegateDefault"; then have_gs='yes'; fi
 have_hp2xx='no'      ; if test "$HPGLDecodeDelegate" !=  "$HPGLDecodeDelegateDefault" ; then have_hp2xx='yes'; fi
 have_ilbmtoppm='no'  ; if test "$ILBMDecodeDelegate" != "$ILBMDecodeDelegateDefault" ; then have_ilbmtoppm='yes'; fi
 have_mrsid='no'; if test "$MrSIDDecodeDelegate" != "$MrSIDDecodeDelegateDefault" ; then have_mrsid='yes'; fi
 have_pcl='no'        ; if test "$PCLDelegate" != "$PCLDelegateDefault"; then have_pcl='yes'; fi
 have_ppmtoilbm='no'  ; if test "$ILBMEncodeDelegate" != "$ILBMEncodeDelegateDefault" ; then have_ppmtoilbm='yes'; fi
-have_ralcgm='no'     ; if test "$CGMDecodeDelegate" != "$CGMDecodeDelegateDefault" ; then have_ralcgm='yes'; fi
 have_xps='no'        ; if test "$XPSDelegate" != "$XPSDelegateDefault"; then have_xps='yes'; fi
 
 #
@@ -3442,7 +3437,6 @@ if test "$with_frozenpaths" != 'yes'; then
   BlenderDecodeDelegate="$BlenderDecodeDelegateDefault"
   BZIPDelegate="$BZIPDelegateDefault"
   BrowseDelegate="$BrowseDelegateDefault"
-  CGMDecodeDelegate="$CGMDecodeDelegateDefault"
   CatDelegate="$CatDelegateDefault"
   ConvertDelegate="$ConvertDelegateDefault"
   DisplayDelegate="$DisplayDelegateDefault"
@@ -3450,7 +3444,6 @@ if test "$with_frozenpaths" != 'yes'; then
   DVIDecodeDelegate="$DVIDecodeDelegateDefault"
   EchoDelegate="$EchoDelegateDefault"
   EditorDelegate="$EditorDelegateDefault"
-  FIGDecodeDelegate="$FIGDecodeDelegateDefault"
   GnuplotDecodeDelegate="$GnuplotDecodeDelegateDefault"
   GVCDecodeDelegate="$GVCDecodeDelegateDefault"
   HPGLDecodeDelegate="$HPGLDecodeDelegateDefault"
@@ -3492,14 +3485,12 @@ AC_SUBST(AutotraceDecodeDelegate)
 AC_SUBST(BlenderDecodeDelegate)
 AC_SUBST(BZIPDelegate)
 AC_SUBST(BrowseDelegate)
-AC_SUBST(CGMDecodeDelegate)
 AC_SUBST(CatDelegate)
 AC_SUBST(ConvertDelegate)
 AC_SUBST(GVCDecodeDelegate)
 AC_SUBST(DVIDecodeDelegate)
 AC_SUBST(EchoDelegate)
 AC_SUBST(EditorDelegate)
-AC_SUBST(FIGDecodeDelegate)
 AC_SUBST(GnuplotDecodeDelegate)
 AC_SUBST(HPGLDecodeDelegate)
 AC_SUBST(HTMLDecodeDelegate)
@@ -3825,15 +3816,12 @@ fi
 if test "$have_ffmpeg"   = 'yes' ; then
    MAGICK_DELEGATES="$MAGICK_DELEGATES mpeg"
 fi
-if test "$have_fitz"    = 'yes' ; then
-   MAGICK_DELEGATES="$MAGICK_DELEGATES fitz"
+if test "$have_mupdf"    = 'yes' ; then
+   MAGICK_DELEGATES="$MAGICK_DELEGATES mupdf"
 fi
 if test "$have_fftw"    = 'yes' ; then
    MAGICK_DELEGATES="$MAGICK_DELEGATES fftw"
 fi
-if test "$have_fig2dev" = 'yes' && test "$have_ps" = 'yes'  ; then
-   MAGICK_DELEGATES="$MAGICK_DELEGATES xfig"
-fi
 if test "$have_fpx"    = 'yes' ; then
    MAGICK_DELEGATES="$MAGICK_DELEGATES fpx"
 fi
@@ -3885,9 +3873,6 @@ fi
 if test "$have_ps"     = 'yes' ; then
    MAGICK_DELEGATES="$MAGICK_DELEGATES ps"
 fi
-if test "$have_ralcgm" = 'yes' ; then
-   MAGICK_DELEGATES="$MAGICK_DELEGATES cgm"
-fi
 if test "$have_ra_ppm" = 'yes' ; then
    MAGICK_DELEGATES="$MAGICK_DELEGATES rad"
 fi
@@ -4064,7 +4049,6 @@ Dejavu fonts      --with-dejavu-font-dir=$with_dejavu_font_dir    $result_dejavu_fo
 DJVU              --with-djvu=$with_djvu               $have_djvu
 DPS               --with-dps=$with_dps         $have_dps
 FFTW              --with-fftw=$with_fftw               $have_fftw
-FITZ              --with-fitz=$with_fitz               $have_fitz
 FlashPIX          --with-fpx=$with_fpx         $have_fpx
 FontConfig        --with-fontconfig=$with_fontconfig           $have_fontconfig
 FreeType          --with-freetype=$with_freetype               $have_freetype
@@ -4083,6 +4067,7 @@ LQR               --with-lqr=$with_lqr            $have_lqr
 LTDL              --with-ltdl=$with_ltdl               $have_ltdl
 LZMA              --with-lzma=$with_lzma               $have_lzma
 Magick++          --with-magick-plus-plus=$with_magick_plus_plus       $have_magick_plus_plus
+MUPDF             --with-mupdf=$with_mupdf             $have_mupdf
 OpenEXR           --with-openexr=$with_openexr         $have_openexr
 PANGO             --with-pango=$with_pango             $have_pango
 PERL              --with-perl=$with_perl               $have_perl