clean up
diff --git a/configure b/configure
index e85836a..be412a6 100755
--- a/configure
+++ b/configure
@@ -4575,7 +4575,7 @@
MAGICK_VERSION=7.0.10-33
-MAGICK_GIT_REVISION=17681:731cd2494:20201004
+MAGICK_GIT_REVISION=17682:6ca2abcd2:20201004
# Substitute library versioning
@@ -9784,7 +9784,7 @@
- if test "${GDI32_LIBS}x" != 'x' ; then
+ if test "${GDI32_LIBS}x" != 'x' ; then
WINGDI32_DELEGATE_TRUE=
WINGDI32_DELEGATE_FALSE='#'
else
@@ -9792,7 +9792,7 @@
WINGDI32_DELEGATE_FALSE=
fi
- if test "${native_win32_build}" = 'yes' ; then
+ if test "${native_win32_build}" = 'yes' ; then
WIN32_NATIVE_BUILD_TRUE=
WIN32_NATIVE_BUILD_FALSE='#'
else
@@ -9800,7 +9800,7 @@
WIN32_NATIVE_BUILD_FALSE=
fi
- if test "${cygwin_build}" = 'yes' ; then
+ if test "${cygwin_build}" = 'yes' ; then
CYGWIN_BUILD_TRUE=
CYGWIN_BUILD_FALSE='#'
else
@@ -9808,7 +9808,7 @@
CYGWIN_BUILD_FALSE=
fi
- if test "x${CC}" = 'xcl.exe' ; then
+ if test "x${CC}" = 'xcl.exe' ; then
USING_CL_TRUE=
USING_CL_FALSE='#'
else
@@ -22154,7 +22154,7 @@
libtool_build_static_libs='yes'
fi
- if test "${libtool_build_shared_libs}" = 'yes'; then
+ if test "${libtool_build_shared_libs}" = 'yes'; then
WITH_SHARED_LIBS_TRUE=
WITH_SHARED_LIBS_FALSE='#'
else
@@ -22191,7 +22191,7 @@
MAGICK_FEATURES="$MAGICK_FEATURES Modules"
fi
- if test "$build_modules" != 'no'; then
+ if test "$build_modules" != 'no'; then
WITH_MODULES_TRUE=
WITH_MODULES_FALSE='#'
else
@@ -22441,7 +22441,7 @@
if test "$with_method_prefix" != 'no'; then
cat >>confdefs.h <<_ACEOF
-#define NAMESPACE_PREFIX $with_method_prefix
+#define NAMESPACE_PREFIX "$with_method_prefix"
_ACEOF
@@ -22460,7 +22460,7 @@
with_legacy_support='no'
fi
- if test "$with_legacy_support" != 'no'; then
+ if test "$with_legacy_support" != 'no'; then
LEGACY_SUPPORT_TRUE=
LEGACY_SUPPORT_FALSE='#'
else
@@ -22478,7 +22478,7 @@
with_utilities='yes'
fi
- if test "$with_utilities" = 'yes'; then
+ if test "$with_utilities" = 'yes'; then
WITH_UTILITIES_TRUE=
WITH_UTILITIES_FALSE='#'
else
@@ -22511,7 +22511,7 @@
QUANTUM_DEPTH="$with_quantum_depth"
cat >>confdefs.h <<_ACEOF
-#define QUANTUM_DEPTH_OBSOLETE_IN_H $QUANTUM_DEPTH
+#define QUANTUM_DEPTH_OBSOLETE_IN_H "$QUANTUM_DEPTH"
_ACEOF
MAGICK_PCFLAGS="$MAGICK_PCFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
@@ -22538,7 +22538,7 @@
if test "$with_cache" != ''; then
cat >>confdefs.h <<_ACEOF
-#define PixelCacheThreshold $with_cache
+#define PixelCacheThreshold "$with_cache"
_ACEOF
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-cache=$with_cache "
@@ -26462,7 +26462,7 @@
$as_echo "$have_magick_plus_plus" >&6; }
LIBS="$OLIBS"
fi
- if test "$have_magick_plus_plus" = 'yes'; then
+ if test "$have_magick_plus_plus" = 'yes'; then
WITH_MAGICK_PLUS_PLUS_TRUE=
WITH_MAGICK_PLUS_PLUS_FALSE='#'
else
@@ -26863,8 +26863,8 @@
have_jemalloc='no'
JEMALLOC_LIBS=''
if test "$with_jemalloc" != 'no'; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JEMALLOC support " >&5
-$as_echo_n "checking for JEMALLOC support ... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JEMALLOC support" >&5
+$as_echo_n "checking for JEMALLOC support... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
$as_echo "" >&6; }
failed=0
@@ -26941,7 +26941,7 @@
$as_echo "no" >&6; }
fi
fi
- if test "$have_jemalloc" = 'yes'; then
+ if test "$have_jemalloc" = 'yes'; then
HasJEMALLOC_TRUE=
HasJEMALLOC_FALSE='#'
else
@@ -27042,8 +27042,8 @@
have_umem='no'
UMEM_LIBS=''
if test "$with_umem" != 'no'; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UMEM support " >&5
-$as_echo_n "checking for UMEM support ... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UMEM support" >&5
+$as_echo_n "checking for UMEM support... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
$as_echo "" >&6; }
failed=0
@@ -27098,6 +27098,7 @@
failed=`expr $failed + 1`
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for umem_free in -lumem" >&5
$as_echo_n "checking for umem_free in -lumem... " >&6; }
if ${ac_cv_lib_umem_umem_free+:} false; then :
@@ -27140,6 +27141,7 @@
failed=`expr $failed + 1`
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if umem memory allocation library is complete" >&5
$as_echo_n "checking if umem memory allocation library is complete... " >&6; }
if test $passed -gt 0; then
@@ -27162,7 +27164,7 @@
$as_echo "no" >&6; }
fi
fi
- if test "$have_umem" = 'yes'; then
+ if test "$have_umem" = 'yes'; then
HAVE_UMEM_TRUE=
HAVE_UMEM_FALSE='#'
else
@@ -27229,7 +27231,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lccmalloc -ldl $LIBS"
+LIBS="-lccmalloc $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -27261,6 +27263,8 @@
$as_echo "$ac_cv_lib_ccmalloc_ccmalloc_malloc" >&6; }
if test "x$ac_cv_lib_ccmalloc_ccmalloc_malloc" = xyes; then :
CCMALLOC_LIBS="$CCMALLOC_PREFIX/lib/ccmalloc-gcc.o -lccmalloc -ldl"
+else
+ ,-ldl
fi
if test -n "$CCMALLOC_LIBS"; then
@@ -27279,7 +27283,7 @@
if test "x$enable_hugepages" != "xno"; then :
-$as_echo "#define HAVE_HUGEPAGES 1" >>confdefs.h
+$as_echo "#define HAVE_HUGEPAGES 1" >>confdefs.h
fi
@@ -27439,7 +27443,7 @@
$as_echo "no" >&6; }
fi
fi
- if test "$have_bzlib" = 'yes'; then
+ if test "$have_bzlib" = 'yes'; then
BZLIB_DELEGATE_TRUE=
BZLIB_DELEGATE_FALSE='#'
else
@@ -28329,7 +28333,7 @@
else
have_x='no'
fi
- if test "$have_x" = 'yes'; then
+ if test "$have_x" = 'yes'; then
X11_DELEGATE_TRUE=
X11_DELEGATE_FALSE='#'
else
@@ -28447,7 +28451,7 @@
LIBS="$ZIPLIB_LIBS $LIBS"
fi
- if test "$have_ziplib" = 'yes'; then
+ if test "$have_ziplib" = 'yes'; then
ZIPLIB_DELEGATE_TRUE=
ZIPLIB_DELEGATE_FALSE='#'
else
@@ -28565,7 +28569,7 @@
LIBS="$ZLIB_LIBS $LIBS"
fi
- if test "$have_zlib" = 'yes'; then
+ if test "$have_zlib" = 'yes'; then
ZLIB_DELEGATE_TRUE=
ZLIB_DELEGATE_FALSE='#'
else
@@ -28683,7 +28687,7 @@
LIBS="$ZSTD_LIBS $LIBS"
fi
- if test "$have_zstd" = 'yes'; then
+ if test "$have_zstd" = 'yes'; then
ZSTD_DELEGATE_TRUE=
ZSTD_DELEGATE_FALSE='#'
else
@@ -28795,7 +28799,7 @@
See \`config.log' for more details" "$LINENO" 5; }
fi
fi
- if test "$have_ltdl" != 'no'; then
+ if test "$have_ltdl" != 'no'; then
WITH_LTDL_TRUE=
WITH_LTDL_FALSE='#'
else
@@ -29071,7 +29075,7 @@
if test "x$ac_cv_lib_dps_DPSInitialize" = xyes; then :
have_libdps='yes'
else
- have_libdps='no'
+ have_libdps='no',
fi
if test "$have_libdps" != 'yes'; then
@@ -29083,7 +29087,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldps -lXt $LIBS"
+LIBS="-ldps $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -29116,7 +29120,7 @@
if test "x$ac_cv_lib_dps_DPSInitialize" = xyes; then :
have_libdps='yes'
else
- have_libdps='no'
+ have_libdps='no',-lXt
fi
if test "$have_libdps" = 'yes'; then
@@ -29134,7 +29138,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldpstk -ldps $LIBDPS_XT $LIBS"
+LIBS="-ldpstk $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -29167,7 +29171,7 @@
if test "x$ac_cv_lib_dpstk_XDPSPixelsPerPoint" = xyes; then :
passed=`expr $passed + 1`
else
- failed=`expr $failed + 1`
+ failed=`expr $failed + 1`,-ldps $LIBDPS_XT
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if DPS package is complete" >&5
@@ -29194,7 +29198,7 @@
CPPFLAGS=$PERSIST_CPPFLAGS
fi
fi
- if test "$have_dps" = 'yes'; then
+ if test "$have_dps" = 'yes'; then
DPS_DELEGATE_TRUE=
DPS_DELEGATE_FALSE='#'
else
@@ -29329,7 +29333,7 @@
CFLAGS="$fftw3_CFLAGS $CFLAGS"
fi
- if test "$have_fftw" = 'yes'; then
+ if test "$have_fftw" = 'yes'; then
FFTW_DELEGATE_TRUE=
FFTW_DELEGATE_FALSE='#'
else
@@ -29535,6 +29539,7 @@
failed=`expr $failed + 1`
fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -29563,7 +29568,7 @@
$as_echo "no" >&6; }
fi
fi
- if test "$have_fpx" = 'yes'; then
+ if test "$have_fpx" = 'yes'; then
FPX_DELEGATE_TRUE=
FPX_DELEGATE_FALSE='#'
else
@@ -29681,7 +29686,7 @@
CFLAGS="$ddjvuapi_CFLAGS $CFLAGS"
fi
- if test "$have_djvu" = 'yes'; then
+ if test "$have_djvu" = 'yes'; then
DJVU_DELEGATE_TRUE=
DJVU_DELEGATE_FALSE='#'
else
@@ -30028,7 +30033,7 @@
CFLAGS="$RAQM_CFLAGS $CFLAGS"
fi
- if test "$have_raqm" = 'yes'; then
+ if test "$have_raqm" = 'yes'; then
RAQM_DELEGATE_TRUE=
RAQM_DELEGATE_FALSE='#'
else
@@ -30199,7 +30204,7 @@
$as_echo "no" >&6; }
fi
fi
- if test "$have_gslib" = 'yes'; then
+ if test "$have_gslib" = 'yes'; then
GS_DELEGATE_TRUE=
GS_DELEGATE_FALSE='#'
else
@@ -30349,7 +30354,7 @@
CFLAGS="$GVC_CFLAGS $CFLAGS"
fi
- if test "$have_gvc" = 'yes'; then
+ if test "$have_gvc" = 'yes'; then
GVC_DELEGATE_TRUE=
GVC_DELEGATE_FALSE='#'
else
@@ -30466,7 +30471,7 @@
CFLAGS="$HEIF_CFLAGS $CFLAGS"
fi
- if test "$have_heic" = 'yes'; then
+ if test "$have_heic" = 'yes'; then
HEIC_DELEGATE_TRUE=
HEIC_DELEGATE_FALSE='#'
else
@@ -30551,6 +30556,7 @@
failed=`expr $failed + 1`
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if JBIG package is complete" >&5
$as_echo_n "checking if JBIG package is complete... " >&6; }
if test $passed -gt 0; then
@@ -30573,7 +30579,7 @@
$as_echo "no" >&6; }
fi
fi
- if test "$have_jbig" = 'yes'; then
+ if test "$have_jbig" = 'yes'; then
JBIG_DELEGATE_TRUE=
JBIG_DELEGATE_FALSE='#'
else
@@ -30685,6 +30691,7 @@
failed=`expr $failed + 1`
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if JPEG package is complete" >&5
$as_echo_n "checking if JPEG package is complete... " >&6; }
if test $passed -gt 0; then
@@ -30707,7 +30714,7 @@
$as_echo "no" >&6; }
fi
fi
- if test "$have_jpeg" = 'yes'; then
+ if test "$have_jpeg" = 'yes'; then
JPEG_DELEGATE_TRUE=
JPEG_DELEGATE_FALSE='#'
else
@@ -30805,6 +30812,7 @@
failed=`expr $failed + 1`
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EncodeBrunsli in -lbrunslienc-c" >&5
$as_echo_n "checking for EncodeBrunsli in -lbrunslienc-c... " >&6; }
if ${ac_cv_lib_brunslienc_c_EncodeBrunsli+:} false; then :
@@ -30847,6 +30855,7 @@
failed=`expr $failed + 1`
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if brunsli package is complete" >&5
$as_echo_n "checking if brunsli package is complete... " >&6; }
if test $passed -gt 0; then
@@ -30869,7 +30878,7 @@
$as_echo "no" >&6; }
fi
fi
- if test "$have_jxl" = 'yes'; then
+ if test "$have_jxl" = 'yes'; then
JXL_DELEGATE_TRUE=
JXL_DELEGATE_FALSE='#'
else
@@ -31001,7 +31010,7 @@
fi
fi
- if test "$have_lcms" = 'yes'; then
+ if test "$have_lcms" = 'yes'; then
LCMS_DELEGATE_TRUE=
LCMS_DELEGATE_FALSE='#'
else
@@ -31118,7 +31127,7 @@
CFLAGS="$LIBOPENJP2_CFLAGS $CFLAGS"
fi
- if test "$have_openjp2" = 'yes'; then
+ if test "$have_openjp2" = 'yes'; then
LIBOPENJP2_DELEGATE_TRUE=
LIBOPENJP2_DELEGATE_FALSE='#'
else
@@ -31236,7 +31245,7 @@
CFLAGS="$LQR_CFLAGS $CFLAGS"
fi
- if test "$have_lqr" = 'yes'; then
+ if test "$have_lqr" = 'yes'; then
LQR_DELEGATE_TRUE=
LQR_DELEGATE_FALSE='#'
else
@@ -31349,7 +31358,7 @@
CFLAGS="$LZMA_CFLAGS $CFLAGS"
fi
- if test "$have_lzma" = 'yes'; then
+ if test "$have_lzma" = 'yes'; then
LZMA_DELEGATE_TRUE=
LZMA_DELEGATE_FALSE='#'
else
@@ -31466,7 +31475,7 @@
CFLAGS="$OPENEXR_CFLAGS $CFLAGS"
fi
- if test "$have_openexr" = 'yes'; then
+ if test "$have_openexr" = 'yes'; then
OPENEXR_DELEGATE_TRUE=
OPENEXR_DELEGATE_FALSE='#'
else
@@ -31664,7 +31673,7 @@
CFLAGS="$PANGOCAIRO_CFLAGS $CFLAGS"
fi
- if test "$have_pango" = 'yes'; then
+ if test "$have_pango" = 'yes'; then
PANGO_DELEGATE_TRUE=
PANGO_DELEGATE_FALSE='#'
else
@@ -31672,7 +31681,7 @@
PANGO_DELEGATE_FALSE=
fi
- if test "$have_pangocairo" = 'yes'; then
+ if test "$have_pangocairo" = 'yes'; then
PANGOCAIRO_DELEGATE_TRUE=
PANGOCAIRO_DELEGATE_FALSE='#'
else
@@ -31789,7 +31798,7 @@
CFLAGS="$PNG_CFLAGS $CFLAGS"
fi
- if test "$have_png" = 'yes'; then
+ if test "$have_png" = 'yes'; then
PNG_DELEGATE_TRUE=
PNG_DELEGATE_FALSE='#'
else
@@ -31906,7 +31915,7 @@
CFLAGS="$RAW_R_CFLAGS $CFLAGS"
fi
- if test "$have_raw" = 'yes'; then
+ if test "$have_raw" = 'yes'; then
RAW_R_DELEGATE_TRUE=
RAW_R_DELEGATE_FALSE='#'
else
@@ -32104,7 +32113,7 @@
CFLAGS="$CAIRO_SVG_CFLAGS $CFLAGS"
fi
- if test "$have_rsvg" = 'yes'; then
+ if test "$have_rsvg" = 'yes'; then
RSVG_DELEGATE_TRUE=
RSVG_DELEGATE_FALSE='#'
else
@@ -32112,7 +32121,7 @@
RSVG_DELEGATE_FALSE=
fi
- if test "$have_cairo" = 'yes'; then
+ if test "$have_cairo" = 'yes'; then
CAIRO_DELEGATE_TRUE=
CAIRO_DELEGATE_FALSE='#'
else
@@ -32426,7 +32435,7 @@
$as_echo "no" >&6; }
fi
fi
- if test "$have_tiff" = 'yes'; then
+ if test "$have_tiff" = 'yes'; then
TIFF_DELEGATE_TRUE=
TIFF_DELEGATE_FALSE='#'
else
@@ -32641,7 +32650,7 @@
CFLAGS="$WEBPMUX_CFLAGS $CFLAGS"
fi
- if test "$have_webp" = 'yes'; then
+ if test "$have_webp" = 'yes'; then
WEBP_DELEGATE_TRUE=
WEBP_DELEGATE_FALSE='#'
else
@@ -32649,7 +32658,7 @@
WEBP_DELEGATE_FALSE=
fi
- if test "$have_webpmux" = 'yes'; then
+ if test "$have_webpmux" = 'yes'; then
WEBPMUX_DELEGATE_TRUE=
WEBPMUX_DELEGATE_FALSE='#'
else
@@ -32900,7 +32909,7 @@
CFLAGS="$XML_CFLAGS $CFLAGS"
fi
- if test "$have_xml" = 'yes'; then
+ if test "$have_xml" = 'yes'; then
XML_DELEGATE_TRUE=
XML_DELEGATE_FALSE='#'
else
@@ -33250,8 +33259,8 @@
XPSDelegateDefault='gxps'
# Search for delegates
-# Extract the first word of ""$BPGDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$BPGDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$BPGDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$BPGDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_BPGDecodeDelegate+:} false; then :
@@ -33277,7 +33286,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_BPGDecodeDelegate" && ac_cv_path_BPGDecodeDelegate=""$BPGDecodeDelegateDefault""
+ test -z "$ac_cv_path_BPGDecodeDelegate" && ac_cv_path_BPGDecodeDelegate=" "$BPGDecodeDelegateDefault""
;;
esac
fi
@@ -33291,8 +33300,8 @@
fi
-# Extract the first word of ""$BPGEncodeDelegateDefault"", so it can be a program name with args.
-set dummy "$BPGEncodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$BPGEncodeDelegateDefault"", so it can be a program name with args.
+set dummy "$BPGEncodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_BPGEncodeDelegate+:} false; then :
@@ -33318,7 +33327,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_BPGEncodeDelegate" && ac_cv_path_BPGEncodeDelegate=""$BPGEncodeDelegateDefault""
+ test -z "$ac_cv_path_BPGEncodeDelegate" && ac_cv_path_BPGEncodeDelegate=" "$BPGEncodeDelegateDefault""
;;
esac
fi
@@ -33332,8 +33341,8 @@
fi
-# Extract the first word of ""$BlenderDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$BlenderDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$BlenderDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$BlenderDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_BlenderDecodeDelegate+:} false; then :
@@ -33359,7 +33368,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_BlenderDecodeDelegate" && ac_cv_path_BlenderDecodeDelegate=""$BlenderDecodeDelegateDefault""
+ test -z "$ac_cv_path_BlenderDecodeDelegate" && ac_cv_path_BlenderDecodeDelegate=" "$BlenderDecodeDelegateDefault""
;;
esac
fi
@@ -33419,8 +33428,8 @@
done
test -n "$BrowseDelegate" || BrowseDelegate=""$BrowseDelegateDefault""
-# Extract the first word of ""$DNGDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$DNGDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$DNGDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$DNGDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_DNGDecodeDelegate+:} false; then :
@@ -33446,7 +33455,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_DNGDecodeDelegate" && ac_cv_path_DNGDecodeDelegate=""$DNGDecodeDelegateDefault""
+ test -z "$ac_cv_path_DNGDecodeDelegate" && ac_cv_path_DNGDecodeDelegate=" "$DNGDecodeDelegateDefault""
;;
esac
fi
@@ -33460,8 +33469,8 @@
fi
-# Extract the first word of ""$DOCDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$DOCDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$DOCDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$DOCDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_DOCDecodeDelegate+:} false; then :
@@ -33487,7 +33496,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_DOCDecodeDelegate" && ac_cv_path_DOCDecodeDelegate=""$DOCDecodeDelegateDefault""
+ test -z "$ac_cv_path_DOCDecodeDelegate" && ac_cv_path_DOCDecodeDelegate=" "$DOCDecodeDelegateDefault""
;;
esac
fi
@@ -33501,8 +33510,8 @@
fi
-# Extract the first word of ""$DVIDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$DVIDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$DVIDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$DVIDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_DVIDecodeDelegate+:} false; then :
@@ -33528,7 +33537,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_DVIDecodeDelegate" && ac_cv_path_DVIDecodeDelegate=""$DVIDecodeDelegateDefault""
+ test -z "$ac_cv_path_DVIDecodeDelegate" && ac_cv_path_DVIDecodeDelegate=" "$DVIDecodeDelegateDefault""
;;
esac
fi
@@ -33542,8 +33551,8 @@
fi
-# Extract the first word of ""$ConvertDelegateDefault"", so it can be a program name with args.
-set dummy "$ConvertDelegateDefault"; ac_word=$2
+# Extract the first word of " "$ConvertDelegateDefault"", so it can be a program name with args.
+set dummy "$ConvertDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_ConvertDelegate+:} false; then :
@@ -33569,7 +33578,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_ConvertDelegate" && ac_cv_path_ConvertDelegate=""$ConvertDelegateDefault""
+ test -z "$ac_cv_path_ConvertDelegate" && ac_cv_path_ConvertDelegate=" "$ConvertDelegateDefault""
;;
esac
fi
@@ -33583,8 +33592,8 @@
fi
-# Extract the first word of ""$DisplayDelegateDefault"", so it can be a program name with args.
-set dummy "$DisplayDelegateDefault"; ac_word=$2
+# Extract the first word of " "$DisplayDelegateDefault"", so it can be a program name with args.
+set dummy "$DisplayDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_DisplayDelegate+:} false; then :
@@ -33610,7 +33619,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_DisplayDelegate" && ac_cv_path_DisplayDelegate=""$DisplayDelegateDefault""
+ test -z "$ac_cv_path_DisplayDelegate" && ac_cv_path_DisplayDelegate=" "$DisplayDelegateDefault""
;;
esac
fi
@@ -33624,8 +33633,8 @@
fi
-# Extract the first word of ""$EditorDelegateDefault"", so it can be a program name with args.
-set dummy "$EditorDelegateDefault"; ac_word=$2
+# Extract the first word of " "$EditorDelegateDefault"", so it can be a program name with args.
+set dummy "$EditorDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_EditorDelegate+:} false; then :
@@ -33651,7 +33660,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_EditorDelegate" && ac_cv_path_EditorDelegate=""$EditorDelegateDefault""
+ test -z "$ac_cv_path_EditorDelegate" && ac_cv_path_EditorDelegate=" "$EditorDelegateDefault""
;;
esac
fi
@@ -33665,8 +33674,8 @@
fi
-# Extract the first word of ""$GVCDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$GVCDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$GVCDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$GVCDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_GVCDecodeDelegate+:} false; then :
@@ -33692,7 +33701,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_GVCDecodeDelegate" && ac_cv_path_GVCDecodeDelegate=""$GVCDecodeDelegateDefault""
+ test -z "$ac_cv_path_GVCDecodeDelegate" && ac_cv_path_GVCDecodeDelegate=" "$GVCDecodeDelegateDefault""
;;
esac
fi
@@ -33706,8 +33715,8 @@
fi
-# Extract the first word of ""$HPGLDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$HPGLDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$HPGLDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$HPGLDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_HPGLDecodeDelegate+:} false; then :
@@ -33733,7 +33742,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_HPGLDecodeDelegate" && ac_cv_path_HPGLDecodeDelegate=""$HPGLDecodeDelegateDefault""
+ test -z "$ac_cv_path_HPGLDecodeDelegate" && ac_cv_path_HPGLDecodeDelegate=" "$HPGLDecodeDelegateDefault""
;;
esac
fi
@@ -33747,8 +33756,8 @@
fi
-# Extract the first word of ""$HTMLDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$HTMLDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$HTMLDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$HTMLDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_HTMLDecodeDelegate+:} false; then :
@@ -33774,7 +33783,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_HTMLDecodeDelegate" && ac_cv_path_HTMLDecodeDelegate=""$HTMLDecodeDelegateDefault""
+ test -z "$ac_cv_path_HTMLDecodeDelegate" && ac_cv_path_HTMLDecodeDelegate=" "$HTMLDecodeDelegateDefault""
;;
esac
fi
@@ -33788,8 +33797,8 @@
fi
-# Extract the first word of ""$ILBMDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$ILBMDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$ILBMDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$ILBMDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_ILBMDecodeDelegate+:} false; then :
@@ -33815,7 +33824,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_ILBMDecodeDelegate" && ac_cv_path_ILBMDecodeDelegate=""$ILBMDecodeDelegateDefault""
+ test -z "$ac_cv_path_ILBMDecodeDelegate" && ac_cv_path_ILBMDecodeDelegate=" "$ILBMDecodeDelegateDefault""
;;
esac
fi
@@ -33829,8 +33838,8 @@
fi
-# Extract the first word of ""$ILBMEncodeDelegateDefault"", so it can be a program name with args.
-set dummy "$ILBMEncodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$ILBMEncodeDelegateDefault"", so it can be a program name with args.
+set dummy "$ILBMEncodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_ILBMEncodeDelegate+:} false; then :
@@ -33856,7 +33865,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_ILBMEncodeDelegate" && ac_cv_path_ILBMEncodeDelegate=""$ILBMEncodeDelegateDefault""
+ test -z "$ac_cv_path_ILBMEncodeDelegate" && ac_cv_path_ILBMEncodeDelegate=" "$ILBMEncodeDelegateDefault""
;;
esac
fi
@@ -33870,8 +33879,8 @@
fi
-# Extract the first word of ""$JXRDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$JXRDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$JXRDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$JXRDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_JXRDecodeDelegate+:} false; then :
@@ -33897,7 +33906,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_JXRDecodeDelegate" && ac_cv_path_JXRDecodeDelegate=""$JXRDecodeDelegateDefault""
+ test -z "$ac_cv_path_JXRDecodeDelegate" && ac_cv_path_JXRDecodeDelegate=" "$JXRDecodeDelegateDefault""
;;
esac
fi
@@ -33911,8 +33920,8 @@
fi
-# Extract the first word of ""$JXREncodeDelegateDefault"", so it can be a program name with args.
-set dummy "$JXREncodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$JXREncodeDelegateDefault"", so it can be a program name with args.
+set dummy "$JXREncodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_JXREncodeDelegate+:} false; then :
@@ -33938,7 +33947,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_JXREncodeDelegate" && ac_cv_path_JXREncodeDelegate=""$JXREncodeDelegateDefault""
+ test -z "$ac_cv_path_JXREncodeDelegate" && ac_cv_path_JXREncodeDelegate=" "$JXREncodeDelegateDefault""
;;
esac
fi
@@ -33952,8 +33961,8 @@
fi
-# Extract the first word of ""$LEPDelegateDefault"", so it can be a program name with args.
-set dummy "$LEPDelegateDefault"; ac_word=$2
+# Extract the first word of " "$LEPDelegateDefault"", so it can be a program name with args.
+set dummy "$LEPDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_LEPDelegate+:} false; then :
@@ -33979,7 +33988,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_LEPDelegate" && ac_cv_path_LEPDelegate=""$LEPDelegateDefault""
+ test -z "$ac_cv_path_LEPDelegate" && ac_cv_path_LEPDelegate=" "$LEPDelegateDefault""
;;
esac
fi
@@ -33993,8 +34002,8 @@
fi
-# Extract the first word of ""$LPDelegateDefault"", so it can be a program name with args.
-set dummy "$LPDelegateDefault"; ac_word=$2
+# Extract the first word of " "$LPDelegateDefault"", so it can be a program name with args.
+set dummy "$LPDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_LPDelegate+:} false; then :
@@ -34020,7 +34029,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_LPDelegate" && ac_cv_path_LPDelegate="no"
+ test -z "$ac_cv_path_LPDelegate" && ac_cv_path_LPDelegate=" no"
;;
esac
fi
@@ -34034,8 +34043,8 @@
fi
-# Extract the first word of ""$LPRDelegateDefault"", so it can be a program name with args.
-set dummy "$LPRDelegateDefault"; ac_word=$2
+# Extract the first word of " "$LPRDelegateDefault"", so it can be a program name with args.
+set dummy "$LPRDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_LPRDelegate+:} false; then :
@@ -34061,7 +34070,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_LPRDelegate" && ac_cv_path_LPRDelegate=""$LPRDelegateDefault""
+ test -z "$ac_cv_path_LPRDelegate" && ac_cv_path_LPRDelegate=" "$LPRDelegateDefault""
;;
esac
fi
@@ -34075,8 +34084,8 @@
fi
-# Extract the first word of ""$LaunchDelegateDefault"", so it can be a program name with args.
-set dummy "$LaunchDelegateDefault"; ac_word=$2
+# Extract the first word of " "$LaunchDelegateDefault"", so it can be a program name with args.
+set dummy "$LaunchDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_LaunchDelegate+:} false; then :
@@ -34102,7 +34111,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_LaunchDelegate" && ac_cv_path_LaunchDelegate=""$LaunchDelegateDefault""
+ test -z "$ac_cv_path_LaunchDelegate" && ac_cv_path_LaunchDelegate=" "$LaunchDelegateDefault""
;;
esac
fi
@@ -34116,8 +34125,8 @@
fi
-# Extract the first word of ""$MogrifyDelegateDefault"", so it can be a program name with args.
-set dummy "$MogrifyDelegateDefault"; ac_word=$2
+# Extract the first word of " "$MogrifyDelegateDefault"", so it can be a program name with args.
+set dummy "$MogrifyDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MogrifyDelegate+:} false; then :
@@ -34143,7 +34152,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_MogrifyDelegate" && ac_cv_path_MogrifyDelegate=""$MogrifyDelegateDefault""
+ test -z "$ac_cv_path_MogrifyDelegate" && ac_cv_path_MogrifyDelegate=" "$MogrifyDelegateDefault""
;;
esac
fi
@@ -34157,8 +34166,8 @@
fi
-# Extract the first word of ""$MPEGDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$MPEGDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$MPEGDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$MPEGDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MPEGDecodeDelegate+:} false; then :
@@ -34184,7 +34193,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_MPEGDecodeDelegate" && ac_cv_path_MPEGDecodeDelegate=""$MPEGDecodeDelegateDefault""
+ test -z "$ac_cv_path_MPEGDecodeDelegate" && ac_cv_path_MPEGDecodeDelegate=" "$MPEGDecodeDelegateDefault""
;;
esac
fi
@@ -34200,8 +34209,8 @@
if test "$MPEGDecodeDelegate" = "$MPEGDecodeDelegateDefault" ; then
MPEGDecodeDelegateDefault='ffmpeg'
- # Extract the first word of ""$MPEGDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$MPEGDecodeDelegateDefault"; ac_word=$2
+ # Extract the first word of " "$MPEGDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$MPEGDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MPEGDecodeDelegate+:} false; then :
@@ -34227,7 +34236,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_MPEGDecodeDelegate" && ac_cv_path_MPEGDecodeDelegate=""$MPEGDecodeDelegateDefault""
+ test -z "$ac_cv_path_MPEGDecodeDelegate" && ac_cv_path_MPEGDecodeDelegate=" "$MPEGDecodeDelegateDefault""
;;
esac
fi
@@ -34242,8 +34251,8 @@
fi;
-# Extract the first word of ""$MPEGEncodeDelegateDefault"", so it can be a program name with args.
-set dummy "$MPEGEncodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$MPEGEncodeDelegateDefault"", so it can be a program name with args.
+set dummy "$MPEGEncodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MPEGEncodeDelegate+:} false; then :
@@ -34269,7 +34278,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_MPEGEncodeDelegate" && ac_cv_path_MPEGEncodeDelegate=""$MPEGEncodeDelegateDefault""
+ test -z "$ac_cv_path_MPEGEncodeDelegate" && ac_cv_path_MPEGEncodeDelegate=" "$MPEGEncodeDelegateDefault""
;;
esac
fi
@@ -34285,8 +34294,8 @@
if test "$MPEGEncodeDelegate" = "$MPEGEncodeDelegateDefault" ; then
MPEGEncodeDelegateDefault='ffmpeg'
- # Extract the first word of ""$MPEGEncodeDelegateDefault"", so it can be a program name with args.
-set dummy "$MPEGEncodeDelegateDefault"; ac_word=$2
+ # Extract the first word of " "$MPEGEncodeDelegateDefault"", so it can be a program name with args.
+set dummy "$MPEGEncodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MPEGEncodeDelegate+:} false; then :
@@ -34312,7 +34321,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_MPEGEncodeDelegate" && ac_cv_path_MPEGEncodeDelegate=""$MPEGEncodeDelegateDefault""
+ test -z "$ac_cv_path_MPEGEncodeDelegate" && ac_cv_path_MPEGEncodeDelegate=" "$MPEGEncodeDelegateDefault""
;;
esac
fi
@@ -34327,8 +34336,8 @@
fi;
-# Extract the first word of ""$MrSIDDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$MrSIDDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$MrSIDDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$MrSIDDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MrSIDDecodeDelegate+:} false; then :
@@ -34354,7 +34363,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_MrSIDDecodeDelegate" && ac_cv_path_MrSIDDecodeDelegate=""$MrSIDDecodeDelegateDefault""
+ test -z "$ac_cv_path_MrSIDDecodeDelegate" && ac_cv_path_MrSIDDecodeDelegate=" "$MrSIDDecodeDelegateDefault""
;;
esac
fi
@@ -34368,8 +34377,8 @@
fi
-# Extract the first word of ""$MVDelegateDefault"", so it can be a program name with args.
-set dummy "$MVDelegateDefault"; ac_word=$2
+# Extract the first word of " "$MVDelegateDefault"", so it can be a program name with args.
+set dummy "$MVDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_MVDelegate+:} false; then :
@@ -34395,7 +34404,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_MVDelegate" && ac_cv_path_MVDelegate=""$MVDelegateDefault""
+ test -z "$ac_cv_path_MVDelegate" && ac_cv_path_MVDelegate=" "$MVDelegateDefault""
;;
esac
fi
@@ -34409,8 +34418,8 @@
fi
-# Extract the first word of ""$PCLDelegateDefault"", so it can be a program name with args.
-set dummy "$PCLDelegateDefault"; ac_word=$2
+# Extract the first word of " "$PCLDelegateDefault"", so it can be a program name with args.
+set dummy "$PCLDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PCLDelegate+:} false; then :
@@ -34436,7 +34445,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_PCLDelegate" && ac_cv_path_PCLDelegate=""$PCLDelegateDefault""
+ test -z "$ac_cv_path_PCLDelegate" && ac_cv_path_PCLDelegate=" "$PCLDelegateDefault""
;;
esac
fi
@@ -34496,8 +34505,8 @@
done
test -n "$PSDelegate" || PSDelegate=""$PSDelegateDefault""
-# Extract the first word of ""$RMDelegateDefault"", so it can be a program name with args.
-set dummy "$RMDelegateDefault"; ac_word=$2
+# Extract the first word of " "$RMDelegateDefault"", so it can be a program name with args.
+set dummy "$RMDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_RMDelegate+:} false; then :
@@ -34523,7 +34532,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_RMDelegate" && ac_cv_path_RMDelegate=""$RMDelegateDefault""
+ test -z "$ac_cv_path_RMDelegate" && ac_cv_path_RMDelegate=" "$RMDelegateDefault""
;;
esac
fi
@@ -34537,8 +34546,8 @@
fi
-# Extract the first word of ""$RSVGDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$RSVGDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$RSVGDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$RSVGDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_RSVGDecodeDelegate+:} false; then :
@@ -34564,7 +34573,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_RSVGDecodeDelegate" && ac_cv_path_RSVGDecodeDelegate=""$RSVGDecodeDelegateDefault""
+ test -z "$ac_cv_path_RSVGDecodeDelegate" && ac_cv_path_RSVGDecodeDelegate=" "$RSVGDecodeDelegateDefault""
;;
esac
fi
@@ -34578,8 +34587,8 @@
fi
-# Extract the first word of ""$SVGDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$SVGDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$SVGDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$SVGDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_SVGDecodeDelegate+:} false; then :
@@ -34605,7 +34614,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_SVGDecodeDelegate" && ac_cv_path_SVGDecodeDelegate=""$SVGDecodeDelegateDefault""
+ test -z "$ac_cv_path_SVGDecodeDelegate" && ac_cv_path_SVGDecodeDelegate=" "$SVGDecodeDelegateDefault""
;;
esac
fi
@@ -34619,8 +34628,8 @@
fi
-# Extract the first word of ""$TraceEncodeDelegateDefault"", so it can be a program name with args.
-set dummy "$TraceEncodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$TraceEncodeDelegateDefault"", so it can be a program name with args.
+set dummy "$TraceEncodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_TraceEncodeDelegate+:} false; then :
@@ -34646,7 +34655,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_TraceEncodeDelegate" && ac_cv_path_TraceEncodeDelegate=""$TraceEncodeDelegateDefault""
+ test -z "$ac_cv_path_TraceEncodeDelegate" && ac_cv_path_TraceEncodeDelegate=" "$TraceEncodeDelegateDefault""
;;
esac
fi
@@ -34660,8 +34669,8 @@
fi
-# Extract the first word of ""$Fig2devDelegateDefault"", so it can be a program name with args.
-set dummy "$Fig2devDelegateDefault"; ac_word=$2
+# Extract the first word of " "$Fig2devDelegateDefault"", so it can be a program name with args.
+set dummy "$Fig2devDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_Fig2devDelegate+:} false; then :
@@ -34687,7 +34696,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_Fig2devDelegate" && ac_cv_path_Fig2devDelegate=""$Fig2devDelegateDefault""
+ test -z "$ac_cv_path_Fig2devDelegate" && ac_cv_path_Fig2devDelegate=" "$Fig2devDelegateDefault""
;;
esac
fi
@@ -34701,8 +34710,8 @@
fi
-# Extract the first word of ""$WebPDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$WebPDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$WebPDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$WebPDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_WebPDecodeDelegate+:} false; then :
@@ -34728,7 +34737,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_WebPDecodeDelegate" && ac_cv_path_WebPDecodeDelegate=""$WebPDecodeDelegateDefault""
+ test -z "$ac_cv_path_WebPDecodeDelegate" && ac_cv_path_WebPDecodeDelegate=" "$WebPDecodeDelegateDefault""
;;
esac
fi
@@ -34742,8 +34751,8 @@
fi
-# Extract the first word of ""$WebPEncodeDelegateDefault"", so it can be a program name with args.
-set dummy "$WebPEncodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$WebPEncodeDelegateDefault"", so it can be a program name with args.
+set dummy "$WebPEncodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_WebPEncodeDelegate+:} false; then :
@@ -34769,7 +34778,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_WebPEncodeDelegate" && ac_cv_path_WebPEncodeDelegate=""$WebPEncodeDelegateDefault""
+ test -z "$ac_cv_path_WebPEncodeDelegate" && ac_cv_path_WebPEncodeDelegate=" "$WebPEncodeDelegateDefault""
;;
esac
fi
@@ -34783,8 +34792,8 @@
fi
-# Extract the first word of ""$WWWDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$WWWDecodeDelegateDefault"; ac_word=$2
+# Extract the first word of " "$WWWDecodeDelegateDefault"", so it can be a program name with args.
+set dummy "$WWWDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_WWWDecodeDelegate+:} false; then :
@@ -34810,7 +34819,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_WWWDecodeDelegate" && ac_cv_path_WWWDecodeDelegate=""$WWWDecodeDelegateDelegateDefault""
+ test -z "$ac_cv_path_WWWDecodeDelegate" && ac_cv_path_WWWDecodeDelegate=" "$WWWDecodeDelegateDelegateDefault""
;;
esac
fi
@@ -34824,8 +34833,8 @@
fi
-# Extract the first word of ""$XPSDelegateDefault"", so it can be a program name with args.
-set dummy "$XPSDelegateDefault"; ac_word=$2
+# Extract the first word of " "$XPSDelegateDefault"", so it can be a program name with args.
+set dummy "$XPSDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_XPSDelegate+:} false; then :
@@ -34851,7 +34860,7 @@
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_XPSDelegate" && ac_cv_path_XPSDelegate=""$XPSDelegateDefault""
+ test -z "$ac_cv_path_XPSDelegate" && ac_cv_path_XPSDelegate=" "$XPSDelegateDefault""
;;
esac
fi
@@ -35257,7 +35266,7 @@
AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
- if test "x$RPM" != "x" ; then
+ if test "x$RPM" != "x" ; then
RPM_DELEGATE_TRUE=
RPM_DELEGATE_FALSE='#'
else
@@ -35313,7 +35322,7 @@
done
- if test "x$P7ZIP" != "x" ; then
+ if test "x$P7ZIP" != "x" ; then
P7ZIP_DELEGATE_TRUE=
P7ZIP_DELEGATE_FALSE='#'
else
@@ -35369,7 +35378,7 @@
done
- if test "x$ZIP" != "x" ; then
+ if test "x$ZIP" != "x" ; then
ZIP_DELEGATE_TRUE=
ZIP_DELEGATE_FALSE='#'
else
@@ -35771,7 +35780,7 @@
fi
fi
- if test "$have_perl" != 'no'; then
+ if test "$have_perl" != 'no'; then
WITH_PERL_TRUE=
WITH_PERL_FALSE='#'
else
@@ -35779,7 +35788,7 @@
WITH_PERL_FALSE=
fi
- if test $with_perl_static = 'yes'; then
+ if test $with_perl_static = 'yes'; then
WITH_PERL_STATIC_TRUE=
WITH_PERL_STATIC_FALSE='#'
else
@@ -35787,7 +35796,7 @@
WITH_PERL_STATIC_FALSE=
fi
- if test $with_perl_dynamic = 'yes'; then
+ if test $with_perl_dynamic = 'yes'; then
WITH_PERL_DYNAMIC_TRUE=
WITH_PERL_DYNAMIC_FALSE='#'
else
@@ -36075,12 +36084,12 @@
# Pass only user-provided LIBS as "global" libraries
LIBS=$USER_LIBS
-#AC_SUBST(CPPFLAGS)
+#AC_SUBST([CPPFLAGS])
-#AC_SUBST(LDFLAGS)
-#AC_SUBST(X_PRE_LIBS)
-#AC_SUBST(X_LIBS)
-#AC_SUBST(X_EXTRA_LIBS)
+#AC_SUBST([LDFLAGS])
+#AC_SUBST([X_PRE_LIBS])
+#AC_SUBST([X_LIBS])
+#AC_SUBST([X_EXTRA_LIBS])
MAGICK_CFLAGS=$CFLAGS
MAGICK_CXXFLAGS="$CXXFLAGS"
diff --git a/configure.ac b/configure.ac
index df866b3..3064c59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,10 +69,10 @@
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS}'${var}=${val}' "
fi
done
-AC_SUBST(DISTCHECK_CONFIG_FLAGS)
+AC_SUBST([DISTCHECK_CONFIG_FLAGS])
CONFIGURE_ARGS="$0 ${ac_configure_args}"
-AC_SUBST(CONFIGURE_ARGS)
+AC_SUBST([CONFIGURE_ARGS])
AC_ARG_ENABLE([reproducible-build],
[AC_HELP_STRING([--enable-reproducible-build],
@@ -86,16 +86,16 @@
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}"
MAGICK_TARGET_CPU=$host_cpu
-AC_SUBST(MAGICK_TARGET_CPU)
-AC_DEFINE_UNQUOTED(MAGICK_TARGET_CPU,$MAGICK_TARGET_CPU,[Target Host CPU])
+AC_SUBST([MAGICK_TARGET_CPU])
+AC_DEFINE_UNQUOTED([MAGICK_TARGET_CPU],[$MAGICK_TARGET_CPU],[Target Host CPU])
MAGICK_TARGET_VENDOR=$host_vendor
-AC_SUBST(MAGICK_TARGET_VENDOR)
-AC_DEFINE_UNQUOTED(MAGICK_TARGET_VENDOR,$MAGICK_TARGET_VENDOR,[Target Host Vendor])
+AC_SUBST([MAGICK_TARGET_VENDOR])
+AC_DEFINE_UNQUOTED([MAGICK_TARGET_VENDOR],[$MAGICK_TARGET_VENDOR],[Target Host Vendor])
MAGICK_TARGET_OS=$host_os
-AC_SUBST(MAGICK_TARGET_OS)
-AC_DEFINE_UNQUOTED(MAGICK_TARGET_OS,$MAGICK_TARGET_OS,[Target Host OS])
+AC_SUBST([MAGICK_TARGET_OS])
+AC_DEFINE_UNQUOTED([MAGICK_TARGET_OS],[$MAGICK_TARGET_OS],[Target Host OS])
# Substitute versioning
@@ -107,36 +107,36 @@
AC_SUBST([MAGICK_GIT_REVISION],[magick_git_revision])
# Substitute library versioning
-AC_SUBST(MAGICK_LIBRARY_CURRENT)dnl
-AC_SUBST(MAGICK_LIBRARY_REVISION)dnl
-AC_SUBST(MAGICK_LIBRARY_AGE)dnl
+AC_SUBST([MAGICK_LIBRARY_CURRENT])dnl
+AC_SUBST([MAGICK_LIBRARY_REVISION])dnl
+AC_SUBST([MAGICK_LIBRARY_AGE])dnl
AC_SUBST([MAGICK_LIBRARY_CURRENT_MIN],
[`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`])
AC_SUBST([MAGICK_LIBRARY_VERSION_INFO],
[$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE])
-AC_SUBST(MAGICKPP_LIBRARY_CURRENT)dnl
-AC_SUBST(MAGICKPP_LIBRARY_REVISION)dnl
-AC_SUBST(MAGICKPP_LIBRARY_AGE)dnl
+AC_SUBST([MAGICKPP_LIBRARY_CURRENT])dnl
+AC_SUBST([MAGICKPP_LIBRARY_REVISION])dnl
+AC_SUBST([MAGICKPP_LIBRARY_AGE])dnl
AC_SUBST([MAGICKPP_LIBRARY_CURRENT_MIN],
[`expr $MAGICKPP_LIBRARY_CURRENT - $MAGICKPP_LIBRARY_AGE`])
AC_SUBST([MAGICKPP_LIBRARY_VERSION_INFO],
[$MAGICKPP_LIBRARY_CURRENT:$MAGICKPP_LIBRARY_REVISION:$MAGICKPP_LIBRARY_AGE])
-AC_SUBST(PACKAGE_NAME)dnl
-AC_SUBST(PACKAGE_VERSION)dnl
-AC_SUBST(PACKAGE_PERL_VERSION)dnl
-AC_SUBST(PACKAGE_RELEASE)dnl
-AC_SUBST(PACKAGE_CHANGE_DATE)dnl
-AC_SUBST(PACKAGE_LIB_VERSION)dnl
-AC_SUBST(PACKAGE_LIB_VERSION_NUMBER)dnl
+AC_SUBST([PACKAGE_NAME])dnl
+AC_SUBST([PACKAGE_VERSION])dnl
+AC_SUBST([PACKAGE_PERL_VERSION])dnl
+AC_SUBST([PACKAGE_RELEASE])dnl
+AC_SUBST([PACKAGE_CHANGE_DATE])dnl
+AC_SUBST([PACKAGE_LIB_VERSION])dnl
+AC_SUBST([PACKAGE_LIB_VERSION_NUMBER])dnl
AS_IF([test X$enable_reproducible_build = Xyes],
[PACKAGE_RELEASE_DATE=$PACKAGE_RELEASE_DATE_REPRODUCIBLE],
[PACKAGE_RELEASE_DATE=$PACKAGE_RELEASE_DATE_RAW],
)
-AC_SUBST(PACKAGE_RELEASE_DATE)dnl
+AC_SUBST([PACKAGE_RELEASE_DATE])dnl
-AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl
+AC_SUBST([PACKAGE_VERSION_ADDENDUM])dnl
# Ensure that make can run correctly
AM_SANITY_CHECK
@@ -155,15 +155,15 @@
MAGICK_LIB_VERSION=${MAGICK_LIB_VERSION}0
fi
MAGICK_LIB_VERSION=${MAGICK_LIB_VERSION}${MAGICK_LIBRARY_REVISION}
-AC_SUBST(MAGICK_LIB_VERSION)
+AC_SUBST([MAGICK_LIB_VERSION])
# Definition used to define MagickLibVersionText in version.h
MAGICK_LIB_VERSION_TEXT="${PACKAGE_VERSION}"
-AC_SUBST(MAGICK_LIB_VERSION_TEXT)
+AC_SUBST([MAGICK_LIB_VERSION_TEXT])
# Definition used to define MagickLibVersionNumber in version.h
MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}"
-AC_SUBST(MAGICK_LIB_VERSION_NUMBER)
+AC_SUBST([MAGICK_LIB_VERSION_NUMBER])
MAGICKPP_LIB_VERSION="0x"
if test ${MAGICKPP_LIBRARY_CURRENT} -lt 10 ; then
@@ -178,15 +178,15 @@
MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0
fi
MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_REVISION}
-AC_SUBST(MAGICKPP_LIB_VERSION)
+AC_SUBST([MAGICKPP_LIB_VERSION])
# Definition used to define MagickLibVersionText in version.h
MAGICKPP_LIB_VERSION_TEXT="${PACKAGE_VERSION}"
-AC_SUBST(MAGICKPP_LIB_VERSION_TEXT)
+AC_SUBST([MAGICKPP_LIB_VERSION_TEXT])
# Definition used to define MagickLibVersionNumber in version.h
MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}"
-AC_SUBST(MAGICK_LIB_VERSION_NUMBER)
+AC_SUBST([MAGICK_LIB_VERSION_NUMBER])
@@ -215,35 +215,35 @@
#
eval "eval PREFIX_DIR=${prefix}"
-AC_SUBST(PREFIX_DIR)
+AC_SUBST([PREFIX_DIR])
eval "eval EXEC_PREFIX_DIR=${exec_prefix}"
-AC_SUBST(EXEC_PREFIX_DIR)
+AC_SUBST([EXEC_PREFIX_DIR])
eval "eval BIN_DIR=$bindir"
-AC_SUBST(BIN_DIR)
+AC_SUBST([BIN_DIR])
eval "eval SBIN_DIR=$sbindir"
-AC_SUBST(SBIN_DIR)
+AC_SUBST([SBIN_DIR])
eval "eval LIBEXEC_DIR=$libexecdir"
-AC_SUBST(LIBEXEC_DIR)
+AC_SUBST([LIBEXEC_DIR])
eval "eval DATA_DIR=$datadir"
-AC_SUBST(DATA_DIR)
+AC_SUBST([DATA_DIR])
eval "eval DOC_DIR=$datadir/doc"
-AC_SUBST(DOC_DIR)
+AC_SUBST([DOC_DIR])
eval "eval SYSCONF_DIR=$sysconfdir"
-AC_SUBST(SYSCONF_DIR)
+AC_SUBST([SYSCONF_DIR])
eval "eval SHAREDSTATE_DIR=$sharedstatedir"
-AC_SUBST(SHAREDSTATE_DIR)
+AC_SUBST([SHAREDSTATE_DIR])
eval "eval LOCALSTATE_DIR=$localstatedir"
-AC_SUBST(LOCALSTATE_DIR)
+AC_SUBST([LOCALSTATE_DIR])
eval "eval LIB_DIR=$libdir"
-AC_SUBST(LIB_DIR)
+AC_SUBST([LIB_DIR])
eval "eval INCLUDE_DIR=$includedir"
-AC_SUBST(INCLUDE_DIR)
+AC_SUBST([INCLUDE_DIR])
eval "eval PERSISTINCLUDE_DIR=$oldincludedir"
-AC_SUBST(PERSISTINCLUDE_DIR)
+AC_SUBST([PERSISTINCLUDE_DIR])
eval "eval INFO_DIR=$infodir"
-AC_SUBST(INFO_DIR)
+AC_SUBST([INFO_DIR])
eval "eval MAN_DIR=$mandir"
-AC_SUBST(MAN_DIR)
+AC_SUBST([MAN_DIR])
# Get full paths to source and build directories
srcdirfull="`cd $srcdir && pwd`"
@@ -271,11 +271,11 @@
DIRSEP=';'
;;
esac
-AC_SUBST(MAGICK_CODER_MODULE_PATH)
-AC_SUBST(MAGICK_CONFIGURE_SRC_PATH)
-AC_SUBST(MAGICK_CONFIGURE_BUILD_PATH)
-AC_SUBST(MAGICK_FILTER_MODULE_PATH)
-AC_SUBST(DIRSEP)
+AC_SUBST([MAGICK_CODER_MODULE_PATH])
+AC_SUBST([MAGICK_CONFIGURE_SRC_PATH])
+AC_SUBST([MAGICK_CONFIGURE_BUILD_PATH])
+AC_SUBST([MAGICK_FILTER_MODULE_PATH])
+AC_SUBST([DIRSEP])
#
@@ -293,7 +293,7 @@
AC_PROG_CPP
AC_PROG_LD
LT_PATH_LD
-AC_SUBST(LD)
+AC_SUBST([LD])
AC_PROG_CC_C99
AM_PROG_CC_C_O
AX_CFLAGS_WARN_ALL
@@ -361,18 +361,18 @@
;;
esac
if test "${GDI32_LIBS}x" != 'x'; then
- AC_DEFINE(WINGDI32_DELEGATE,1,Define to use the Windows GDI32 library)
+ AC_DEFINE([WINGDI32_DELEGATE],[1],[Define to use the Windows GDI32 library])
fi
-AC_SUBST(GDI32_LIBS)
-AC_SUBST(OLE_LIBS)
-AC_SUBST(WS2_32_LIBS)
-AM_CONDITIONAL(WINGDI32_DELEGATE, test "${GDI32_LIBS}x" != 'x' )
-AM_CONDITIONAL(WIN32_NATIVE_BUILD, test "${native_win32_build}" = 'yes' )
-AM_CONDITIONAL(CYGWIN_BUILD, test "${cygwin_build}" = 'yes' )
-AM_CONDITIONAL(USING_CL, test "x${CC}" = 'xcl.exe' )
+AC_SUBST([GDI32_LIBS])
+AC_SUBST([OLE_LIBS])
+AC_SUBST([WS2_32_LIBS])
+AM_CONDITIONAL([WINGDI32_DELEGATE],[ test "${GDI32_LIBS}x" != 'x' ])
+AM_CONDITIONAL([WIN32_NATIVE_BUILD],[ test "${native_win32_build}" = 'yes' ])
+AM_CONDITIONAL([CYGWIN_BUILD],[ test "${cygwin_build}" = 'yes' ])
+AM_CONDITIONAL([USING_CL],[ test "x${CC}" = 'xcl.exe' ])
WinPathScript="${srcdirfull}/winpath.sh"
-AC_SUBST(WinPathScript)
+AC_SUBST([WinPathScript])
#
# Compiler flags tweaks
@@ -453,7 +453,7 @@
[includearch_dir=$INCLUDE_DIR])
eval "eval INCLUDEARCH_DIR=$includearch_dir"
-AC_SUBST(INCLUDEARCH_DIR)
+AC_SUBST([INCLUDEARCH_DIR])
#
# ARCH specific configuration directory
@@ -465,7 +465,7 @@
[sharearch_dir="${LIB_DIR}"])
eval "eval SHAREARCH_DIR=$sharearch_dir"
-AC_SUBST(SHAREARCH_DIR)
+AC_SUBST([SHAREARCH_DIR])
# Path to the pkgconfig folder
AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=DIR],
@@ -495,11 +495,11 @@
AC_MSG_WARN([Replacing compiler $CC with compiler $PTHREAD_CC to support pthreads.])
CC="$PTHREAD_CC"
fi
- AC_DEFINE(THREAD_SUPPORT,1,[Define if you have POSIX threads libraries and header files.])
+ AC_DEFINE([THREAD_SUPPORT],[1],[[Define if you have POSIX threads libraries and header files.]])
fi
fi
LIBS="$LIBS $THREAD_LIBS"
-AC_SUBST(THREAD_LIBS)
+AC_SUBST([THREAD_LIBS])
# Enable support for OpenMP
if test "$have_threads" != 'yes'; then
@@ -508,7 +508,7 @@
AC_OPENMP([C])
CFLAGS="$OPENMP_CFLAGS $CFLAGS"
MAGICK_PCFLAGS="$MAGICK_PCFLAGS $OPENMP_CFLAGS"
-AC_SUBST(OPENMP_CFLAGS)
+AC_SUBST([OPENMP_CFLAGS])
if test "$enable_openmp" != no; then
if test "$ac_cv_prog_c_openmp" != 'unsupported'; then
MAGICK_FEATURES="OpenMP $MAGICK_FEATURES"
@@ -556,21 +556,21 @@
LFS_CPPFLAGS="$LFS_CPPFLAGS -D_LARGEFILE_SOURCE=1"
fi
fi
-AC_SUBST(LFS_CPPFLAGS)
+AC_SUBST([LFS_CPPFLAGS])
#
# Set SETJMP_IS_THREAD_SAFE define.
#
case "${host_os}" in
solaris2* ) ;;
- *) AC_DEFINE(SETJMP_IS_THREAD_SAFE,1,[Setjmp/longjmp are thread safe]) ;;
+ *) AC_DEFINE([SETJMP_IS_THREAD_SAFE],[1],[[Setjmp/longjmp are thread safe]]) ;;
esac
# Configure libtool
: ${AR_FLAGS=cr}
LT_INIT([win32-dll dlopen])
LT_LANG([C++])
-AC_SUBST(LIBTOOL_DEPS)
+AC_SUBST([LIBTOOL_DEPS])
# Check to see if building shared libraries
libtool_build_shared_libs='no'
@@ -584,7 +584,7 @@
libtool_build_static_libs='yes'
fi
-AM_CONDITIONAL(WITH_SHARED_LIBS, test "${libtool_build_shared_libs}" = 'yes')
+AM_CONDITIONAL([WITH_SHARED_LIBS],[ test "${libtool_build_shared_libs}" = 'yes'])
#
# Enable support for building loadable modules
#
@@ -605,10 +605,10 @@
fi
fi
if test "$build_modules" != 'no' ; then
- AC_DEFINE(BUILD_MODULES,1,Define if coders and filters are to be built as modules.)
+ AC_DEFINE([BUILD_MODULES],[1],[Define if coders and filters are to be built as modules.])
MAGICK_FEATURES="$MAGICK_FEATURES Modules"
fi
-AM_CONDITIONAL(WITH_MODULES, test "$build_modules" != 'no')
+AM_CONDITIONAL([WITH_MODULES],[ test "$build_modules" != 'no'])
# Enable build using delegate libraries built in subdirectories rather than installed
# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms lzma png tiff ttf wmf xml zlib zip)
@@ -625,7 +625,7 @@
[enable_deprecated='no'])
if test "$enable_deprecated" = 'yes'; then
- AC_DEFINE(EXCLUDE_DEPRECATED,1,[exclude deprecated methods in MagickCore API])
+ AC_DEFINE([EXCLUDE_DEPRECATED],[1],[[exclude deprecated methods in MagickCore API]])
else
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --disable-deprecated "
fi
@@ -639,7 +639,7 @@
[enable_installed='yes'])
if test "$enable_installed" = 'yes'; then
- AC_DEFINE(INSTALLED_SUPPORT,1,[ImageMagick is formally installed under prefix])
+ AC_DEFINE([INSTALLED_SUPPORT],[1],[[ImageMagick is formally installed under prefix]])
else
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --disable-installed "
fi
@@ -652,7 +652,7 @@
[enable_cipher='yes'])
if test "$enable_cipher" = 'yes'; then
- AC_DEFINE(CIPHER_SUPPORT,1,[permit enciphering and deciphering image pixels])
+ AC_DEFINE([CIPHER_SUPPORT],[1],[[permit enciphering and deciphering image pixels]])
MAGICK_FEATURES="Cipher $MAGICK_FEATURES"
fi
@@ -664,10 +664,10 @@
[enable_zero_configuration='no'])
if test "$enable_zero_configuration" = 'yes'; then
- AC_DEFINE(ZERO_CONFIGURATION_SUPPORT,1,[Build self-contained, embeddable, zero-configuration ImageMagick])
+ AC_DEFINE([ZERO_CONFIGURATION_SUPPORT],[1],[[Build self-contained, embeddable, zero-configuration ImageMagick]])
MAGICK_FEATURES="Zero-configuration $MAGICK_FEATURES"
fi
-AM_CONDITIONAL([MAGICKCORE_ZERO_CONFIGURATION_SUPPORT], [test "$enable_zero_configuration" = yes])
+AM_CONDITIONAL([MAGICKCORE_ZERO_CONFIGURATION_SUPPORT],[test "$enable_zero_configuration" = yes])
# Build a high dynamic range version of ImageMagick.
AC_ARG_ENABLE([hdri],
@@ -684,8 +684,8 @@
else
magick_hdri_enable='0'
fi
-AC_DEFINE_UNQUOTED(HDRI_ENABLE_OBSOLETE_IN_H,$magick_hdri_enable,[Whether hdri is enabled or not])
-AC_SUBST(MAGICK_HDRI)dnl
+AC_DEFINE_UNQUOTED([HDRI_ENABLE_OBSOLETE_IN_H],[$magick_hdri_enable],[Whether hdri is enabled or not])
+AC_SUBST([MAGICK_HDRI])dnl
MAGICK_PCFLAGS="$MAGICK_PCFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
CFLAGS="$CFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
CPPFLAGS="$CPPFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
@@ -698,7 +698,7 @@
[enable_pipes='no'])
if test "$enable_pipes" = 'yes'; then
- AC_DEFINE(PIPES_SUPPORT,1,[enable pipes (|) in filenames])
+ AC_DEFINE([PIPES_SUPPORT],[1],[[enable pipes (|]) in filenames])
MAGICK_FEATURES="Pipes $MAGICK_FEATURES"
fi
@@ -710,7 +710,7 @@
[enable_assert='yes'])
if test "$enable_assert" = 'no'; then
- AC_DEFINE(NDEBUG,1,[Turn off assert statements])
+ AC_DEFINE([NDEBUG],[1],[[Turn off assert statements]])
fi
# Don't emit "rebuild rules" for configure, Makefile.ins, etc.
@@ -774,23 +774,23 @@
[with_method_prefix='no'])
if test "$with_method_prefix" != 'no'; then
- AC_DEFINE_UNQUOTED(NAMESPACE_PREFIX,$with_method_prefix,[Magick API method prefix])
- AC_DEFINE_UNQUOTED(NAMESPACE_PREFIX_TAG,["$with_method_prefix"],[Magick API method prefix tag])
+ AC_DEFINE_UNQUOTED([NAMESPACE_PREFIX],["$with_method_prefix"],[Magick API method prefix])
+ AC_DEFINE_UNQUOTED([NAMESPACE_PREFIX_TAG],["$with_method_prefix"],[Magick API method prefix tag])
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-method-prefix "
fi
# Enable legacy support (default no)
-AC_ARG_ENABLE(legacy-support,
+AC_ARG_ENABLE([legacy-support],
[ --enable-legacy-support install legacy command-line utilities (default disabled)],
[with_legacy_support=$enableval],
[with_legacy_support='no'])
-AM_CONDITIONAL(LEGACY_SUPPORT, test "$with_legacy_support" != 'no')
+AM_CONDITIONAL([LEGACY_SUPPORT],[ test "$with_legacy_support" != 'no'])
# Enable building command line utilities (default yes)
-AC_ARG_WITH(utilities,
+AC_ARG_WITH([utilities],
[ --with-utilities enable building command-line utilities (default yes)],
[with_utilities=$withval], [with_utilities='yes'])
-AM_CONDITIONAL(WITH_UTILITIES, test "$with_utilities" = 'yes')
+AM_CONDITIONAL([WITH_UTILITIES],[ test "$with_utilities" = 'yes'])
# Number of bits in a Quantum
AC_ARG_WITH([quantum-depth],
@@ -811,8 +811,8 @@
* ) AC_MSG_ERROR("Pixel quantum depth must have value of 8, 16, 32, or 64") ;;
esac
QUANTUM_DEPTH="$with_quantum_depth"
-AC_DEFINE_UNQUOTED(QUANTUM_DEPTH_OBSOLETE_IN_H,$QUANTUM_DEPTH,[Number of bits in a pixel Quantum (8/16/32/64)])
-AC_SUBST(QUANTUM_DEPTH)dnl
+AC_DEFINE_UNQUOTED([QUANTUM_DEPTH_OBSOLETE_IN_H],["$QUANTUM_DEPTH"],[Number of bits in a pixel Quantum (8/16/32/64)])
+AC_SUBST([QUANTUM_DEPTH])dnl
MAGICK_PCFLAGS="$MAGICK_PCFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
CFLAGS="$CFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
CPPFLAGS="$CPPFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
@@ -822,7 +822,7 @@
if test "$enable_hdri" = 'yes'; then
MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}${MAGICK_HDRI}"
fi
-AC_SUBST(MAGICK_ABI_SUFFIX)
+AC_SUBST([MAGICK_ABI_SUFFIX])
# Set pixel cache threshold
AC_ARG_WITH([cache],
@@ -832,7 +832,7 @@
[with_cache=''])
if test "$with_cache" != ''; then
- AC_DEFINE_UNQUOTED(PixelCacheThreshold,$with_cache,[Pixel cache threshold in MB (defaults to available memory)])
+ AC_DEFINE_UNQUOTED([PixelCacheThreshold],["$with_cache"],[Pixel cache threshold in MB (defaults to available memory)])
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-cache=$with_cache "
fi
@@ -855,7 +855,7 @@
[AC_HELP_STRING([--with-package-release-name=NAME],
[encode this name into the shared library])],
[MAGICK_LT_RELEASE_OPTS="-release $withval"])
-AC_SUBST(MAGICK_LT_RELEASE_OPTS)
+AC_SUBST([MAGICK_LT_RELEASE_OPTS])
# Disable build/install of PerlMagick.
AC_ARG_WITH([perl],
@@ -869,10 +869,10 @@
[AC_HELP_STRING([--with-perl-options=OPTIONS],
[options to pass on command-line when generating PerlMagick build file])],
PERL_MAKE_OPTIONS=$withval)
-AC_SUBST(PERL_MAKE_OPTIONS)
+AC_SUBST([PERL_MAKE_OPTIONS])
# Enable jemalloc, object-caching memory allocation library.
-AC_ARG_WITH(jemalloc,
+AC_ARG_WITH([jemalloc],
[ --with-jemalloc enable jemalloc memory allocation library support],
[with_jemalloc=$withval],
[with_jemalloc='no'])
@@ -881,7 +881,7 @@
fi
# Enable use of TCMalloc library.
-AC_ARG_WITH(tcmalloc,
+AC_ARG_WITH([tcmalloc],
AS_HELP_STRING([--with-tcmalloc],
[enable tcmalloc memory allocation library support]),
[with_tcmalloc=$withval],
@@ -891,7 +891,7 @@
fi
# Enable umem, object-caching memory allocation library.
-AC_ARG_WITH(umem,
+AC_ARG_WITH([umem],
[ --with-umem enable umem memory allocation library support],
[with_umem=$withval],
[with_umem='no'])
@@ -913,7 +913,7 @@
LIBSTDCLDFLAGS="-L$with_libstdc"
fi
fi
-AC_SUBST(LIBSTDCLDFLAGS)
+AC_SUBST([LIBSTDCLDFLAGS])
# Does gcc required -traditional?
AC_PROG_GCC_TRADITIONAL
@@ -951,8 +951,8 @@
MAGICK_PCFLAGS="$MAGICK_PCFLAGS -D_MT"
fi
fi
-AC_SUBST(MODULE_EXTRA_CPPFLAGS)
-AC_SUBST(LIBRARY_EXTRA_CPPFLAGS)
+AC_SUBST([MODULE_EXTRA_CPPFLAGS])
+AC_SUBST([LIBRARY_EXTRA_CPPFLAGS])
# Check standard headers
AC_HEADER_STDC
@@ -1028,9 +1028,9 @@
# Obtain size of a 'unsigned long long' and define as
# SIZEOF_UNSIGNED_LONG_LONG. If 'unsigned long long' is not
# supported then the value defined is zero.
-AC_CHECK_SIZEOF(unsigned long long)
+AC_CHECK_SIZEOF([unsigned long long])
-AC_CHECK_SIZEOF(void *)
+AC_CHECK_SIZEOF([void *])
AC_MSG_CHECKING([whether our compiler supports __func__])
AC_TRY_COMPILE([],
@@ -1066,9 +1066,9 @@
# Find math library
#
MATH_LIBS=''
-AC_CHECK_LIB(m,sqrt,MATH_LIBS="-lm",,)
+AC_CHECK_LIB([m],[sqrt],[MATH_LIBS="-lm"],[])
LIBS="$MATH_LIBS $LIBS"
-AC_SUBST(MATH_LIBS)
+AC_SUBST([MATH_LIBS])
#
# Find socket library
@@ -1092,11 +1092,11 @@
[[#include <time.h>]],
[[clockid_t clockType = CLOCK_REALTIME;]])],
[
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_CLOCK_REALTIME],[1],
[Define to 1 if clock_gettime supports CLOCK_REALTIME.])
],
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no])
)
],
[
@@ -1129,7 +1129,7 @@
if test "$with_magick_plus_plus" = 'yes'; then
OLIBS="$LIBS"
LIBS=''
- AC_LANG_PUSH(C++)
+ AC_LANG_PUSH([C++])
# Full set of headers used...
# algorithm cctype cerrno cmath cstdio cstdlib cstring ctime exception
@@ -1156,7 +1156,7 @@
AC_MSG_RESULT([$have_magick_plus_plus])
LIBS="$OLIBS"
fi
-AM_CONDITIONAL(WITH_MAGICK_PLUS_PLUS, test "$have_magick_plus_plus" = 'yes')
+AM_CONDITIONAL([WITH_MAGICK_PLUS_PLUS],[ test "$have_magick_plus_plus" = 'yes'])
# Only check for delegate libraries in subdirectories if requested.
if test "$enable_delegate_build" != 'no'; then
@@ -1206,7 +1206,7 @@
#
# Find the X11 RGB database
#
-AC_CACHE_CHECK(for X11 configure files,im_cv_x_configure,
+AC_CACHE_CHECK([for X11 configure files],[im_cv_x_configure],
[# Look for the header file in a standard set of common directories.
# Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in \
@@ -1257,7 +1257,7 @@
X11ConfigurePath=`$WinPathScript "$X11ConfigurePath=" 1`
;;
esac
-AC_DEFINE_UNQUOTED(X11_CONFIGURE_PATH,"$X11ConfigurePath",[Location of X11 configure files])
+AC_DEFINE_UNQUOTED([X11_CONFIGURE_PATH],["$X11ConfigurePath"],[Location of X11 configure files])
#
# Find OpenMP library
@@ -1268,36 +1268,36 @@
# Open64 (passes for GCC but uses different OpenMP implementation)
if test "x$GOMP_LIBS" = x ; then
if $CC --version 2>&1 | grep Open64 > /dev/null ; then
- AC_CHECK_LIB(openmp,omp_get_num_procs,GOMP_LIBS="-lopenmp",,)
+ AC_CHECK_LIB([openmp],[omp_get_num_procs],[GOMP_LIBS="-lopenmp"],[],[])
fi
fi
# Clang (passes for GCC but uses different OpenMP implementation)
if test "x$LIB_OMP" = x ; then
if $CC --version 2>&1 | grep clang > /dev/null ; then
- AC_CHECK_LIB(omp,GOMP_parallel_start,LIB_OMP="-lomp",,)
+ AC_CHECK_LIB([omp],[GOMP_parallel_start],[LIB_OMP="-lomp"],[],[])
fi
fi
# GCC
if test "x$GOMP_LIBS" = x ; then
- AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,)
+ AC_CHECK_LIB([gomp],[GOMP_parallel_start],[GOMP_LIBS="-lgomp"],[],[])
fi
else
# Sun CC
if test "x$GOMP_LIBS" = x ; then
- AC_CHECK_LIB(mtsk,sunw_mp_register_warn,GOMP_LIBS="-lmtsk",,)
+ AC_CHECK_LIB([mtsk],[sunw_mp_register_warn],[GOMP_LIBS="-lmtsk"],[],[])
fi
# AIX xlc
if test "x$GOMP_LIBS" = x ; then
- AC_CHECK_LIB(xlsmp,_xlsmpFlush,GOMP_LIBS="-lxlsmp",,)
+ AC_CHECK_LIB([xlsmp],[_xlsmpFlush],[GOMP_LIBS="-lxlsmp"],[],[])
fi
# SGI IRIX 6.5 MIPSpro C/C++
if test "x$GOMP_LIBS" = x ; then
- AC_CHECK_LIB(mp,mp_destroy,GOMP_LIBS="-lmp",,)
+ AC_CHECK_LIB([mp],[mp_destroy],[GOMP_LIBS="-lmp"],[],[])
fi
fi
LIBS="$GOMP_LIBS $LIBS"
fi
-AC_SUBST(GOMP_LIBS)
+AC_SUBST([GOMP_LIBS])
#
# Check for jemalloc.
@@ -1305,30 +1305,30 @@
have_jemalloc='no'
JEMALLOC_LIBS=''
if test "$with_jemalloc" != 'no'; then
- AC_MSG_CHECKING(for JEMALLOC support )
- AC_MSG_RESULT()
+ AC_MSG_CHECKING([for JEMALLOC support])
+ AC_MSG_RESULT([])
failed=0
passed=0
AC_CHECK_HEADER([jemalloc/jemalloc.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
- AC_CHECK_LIB(jemalloc,[malloc_stats_print],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],)
- AC_MSG_CHECKING(if jemalloc memory allocation library is complete)
+ AC_CHECK_LIB([jemalloc],[malloc_stats_print],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
+ AC_MSG_CHECKING([if jemalloc memory allocation library is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_RESULT(no -- some components failed test)
+ AC_MSG_RESULT([no -- some components failed test])
have_jemalloc='no (failed tests)'
else
JEMALLOC_LIBS='-ljemalloc'
LIBS="$JEMALLOC_LIBS $LIBS"
- AC_DEFINE(HasJEMALLOC,1,Define if you have jemalloc memory allocation library)
- AC_MSG_RESULT(yes)
+ AC_DEFINE([HasJEMALLOC],[1],[Define if you have jemalloc memory allocation library])
+ AC_MSG_RESULT([yes])
have_jemalloc='yes'
fi
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no])
fi
fi
-AM_CONDITIONAL(HasJEMALLOC, test "$have_jemalloc" = 'yes')
-AC_SUBST(JEMALLOC_LIBS)
+AM_CONDITIONAL([HasJEMALLOC],[ test "$have_jemalloc" = 'yes'])
+AC_SUBST([JEMALLOC_LIBS])
#
# Check for TCMalloc library
@@ -1358,7 +1358,7 @@
AC_MSG_CHECKING([if tcmalloc memory allocation library is complete ])
AC_MSG_RESULT([$have_tcmalloc])
fi
-AM_CONDITIONAL([HAVE_TCMALLOC], [test "$have_tcmalloc" = 'yes'])
+AM_CONDITIONAL([HAVE_TCMALLOC],[test "$have_tcmalloc" = 'yes'])
AC_SUBST([TCMALLOC_LIBS])
#
@@ -1367,31 +1367,33 @@
have_umem='no'
UMEM_LIBS=''
if test "$with_umem" != 'no'; then
- AC_MSG_CHECKING(for UMEM support )
- AC_MSG_RESULT()
+ AC_MSG_CHECKING([for UMEM support])
+ AC_MSG_RESULT([])
failed=0
passed=0
- AC_CHECK_HEADER(umem.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_LIB(umem,umem_alloc,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_CHECK_LIB(umem,umem_free,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_MSG_CHECKING(if umem memory allocation library is complete)
+ AC_CHECK_HEADER([umem.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_LIB([umem],[umem_alloc],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
+
+ AC_CHECK_LIB([umem],[umem_free],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
+
+ AC_MSG_CHECKING([if umem memory allocation library is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_RESULT(no -- some components failed test)
+ AC_MSG_RESULT([no -- some components failed test])
have_umem='no (failed tests)'
else
UMEM_LIBS='-lumem'
LIBS="$UMEM_LIBS $LIBS"
- AC_DEFINE(HAVE_UMEM,1,Define if you have umem memory allocation library)
- AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_UMEM],[1],[Define if you have umem memory allocation library])
+ AC_MSG_RESULT([yes])
have_umem='yes'
fi
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no])
fi
fi
-AM_CONDITIONAL(HAVE_UMEM, test "$have_umem" = 'yes')
-AC_SUBST(UMEM_LIBS)
+AM_CONDITIONAL([HAVE_UMEM],[ test "$have_umem" = 'yes'])
+AC_SUBST([UMEM_LIBS])
#
# Add support for ccmalloc memory debugging library if requested
@@ -1399,13 +1401,13 @@
have_ccmalloc='no'
CCMALLOC_LIBS=''
if test "$enable_ccmalloc" = 'yes'; then
- AC_PATH_PROG(CCMALLOCDelegate,ccmalloc,)
+ AC_PATH_PROG([CCMALLOCDelegate],[ccmalloc],[])
if test -n "$CCMALLOCDelegate"; then
eval `grep PREFIX= $CCMALLOCDelegate | sed -e 's/PREFIX/CCMALLOC_PREFIX/'`
OLIBS="$LIBS"
# Assume that gcc is used with ccmalloc.
LIBS="$LIBS $CCMALLOC_PREFIX/lib/ccmalloc-gcc.o"
- AC_CHECK_LIB(ccmalloc,ccmalloc_malloc,CCMALLOC_LIBS="$CCMALLOC_PREFIX/lib/ccmalloc-gcc.o -lccmalloc -ldl",,-ldl)
+ AC_CHECK_LIB([ccmalloc],[ccmalloc_malloc],[CCMALLOC_LIBS="$CCMALLOC_PREFIX/lib/ccmalloc-gcc.o -lccmalloc -ldl"],[,-ldl])
if test -n "$CCMALLOC_LIBS"; then
LIBS="$OLIBS"
LIBS="$LIBS $CCMALLOC_LIBS"
@@ -1420,7 +1422,7 @@
# Add support for 'huge pages' if requested
#
AS_IF([test "x$enable_hugepages" != "xno"],[
- AC_DEFINE(HAVE_HUGEPAGES, 1, [Compile with hugepage support])
+ AC_DEFINE([HAVE_HUGEPAGES],[ 1],[ [Compile with hugepage support]])
])
#
@@ -1456,34 +1458,34 @@
failed=0
passed=0
found_libbz=0
- AC_CHECK_HEADER(bzlib.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_LIB(bz2,BZ2_bzDecompress,found_libbz=`expr $found_libbz + 1`,,)
+ AC_CHECK_HEADER([bzlib.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_LIB([bz2],[BZ2_bzDecompress],[found_libbz=`expr $found_libbz + 1`],[],[])
if test "$native_win32_build" = 'yes'; then
- AC_CHECK_LIB(bz2,_imp__BZ2_decompress,found_libbz=`expr $found_libbz + 1`,,)
+ AC_CHECK_LIB([bz2],[_imp__BZ2_decompress],[found_libbz=`expr $found_libbz + 1`],[],[])
fi
if test $found_libbz -gt 0; then
passed=`expr $passed + 1`
else
failed=`expr $failed + 1`
fi
- AC_MSG_CHECKING(if BZLIB package is complete)
+ AC_MSG_CHECKING([if BZLIB package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
- AC_MSG_RESULT(no -- some components failed test)
+ AC_MSG_RESULT([no -- some components failed test])
have_bzlib='no (failed tests)'
else
BZLIB_LIBS='-lbz2'
LIBS="$BZLIB_LIBS $LIBS"
- AC_DEFINE(BZLIB_DELEGATE,1,Define if you have the bzip2 library)
- AC_MSG_RESULT(yes)
+ AC_DEFINE([BZLIB_DELEGATE],[1],[Define if you have the bzip2 library])
+ AC_MSG_RESULT([yes])
have_bzlib='yes'
fi
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no])
fi
fi
-AM_CONDITIONAL(BZLIB_DELEGATE, test "$have_bzlib" = 'yes')
-AC_SUBST(BZLIB_LIBS)
+AM_CONDITIONAL([BZLIB_DELEGATE],[ test "$have_bzlib" = 'yes'])
+AC_SUBST([BZLIB_LIBS])
#
# Find the X11 include and library directories.
@@ -1502,7 +1504,7 @@
LIBS="$X11_LIBS $LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- AC_DEFINE(X11_DELEGATE,1,Define if you have X11 library)dnl
+ AC_DEFINE([X11_DELEGATE],[1],[Define if you have X11 library])dnl
#
# Check for X11 shared memory extension
@@ -1524,7 +1526,7 @@
# Check for X11 shape extension
#
AC_CHECK_LIB([Xext],[XShapeCombineMask],[XEXT_LIBS='-lXext' ; AC_DEFINE(HAVE_SHAPE,1,X11 server supports shape extension)],[],[])
- AC_CHECK_LIB(Xt,XtSetEventDispatcher,XT_LIBS='-lXt',,)
+ AC_CHECK_LIB([Xt],[XtSetEventDispatcher],[XT_LIBS='-lXt'],[],[])
LIBS="$XEXT_LIBS $XT_LIBS $LIBS"
fi
if test "$no_x" != 'yes'; then
@@ -1532,9 +1534,9 @@
else
have_x='no'
fi
-AM_CONDITIONAL(X11_DELEGATE, test "$have_x" = 'yes')
-AC_SUBST(X11_LIBS)
-AC_SUBST(XEXT_LIBS)
+AM_CONDITIONAL([X11_DELEGATE],[ test "$have_x" = 'yes'])
+AC_SUBST([X11_LIBS])
+AC_SUBST([XEXT_LIBS])
dnl ===========================================================================
@@ -1557,19 +1559,19 @@
ZIPLIB_PKG=""
if test "x$with_ziplib" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(ZIPLIB,[libzip >= 1.0.0], have_ziplib=yes, have_ziplib=no)
+ PKG_CHECK_MODULES([ZIPLIB],[libzip >= 1.0.0],[have_ziplib=yes],[have_ziplib=no])
AC_MSG_RESULT([])
fi
if test "$have_ziplib" = 'yes'; then
- AC_DEFINE(ZIPLIB_DELEGATE,1,Define if you have ZIPLIB library)
+ AC_DEFINE([ZIPLIB_DELEGATE],[1],[Define if you have ZIPLIB library])
CFLAGS="$ZIPLIB_CFLAGS $CFLAGS"
LIBS="$ZIPLIB_LIBS $LIBS"
fi
-AM_CONDITIONAL(ZIPLIB_DELEGATE, test "$have_ziplib" = 'yes')
-AC_SUBST(ZIPLIB_CFLAGS)
-AC_SUBST(ZIPLIB_LIBS)
+AM_CONDITIONAL([ZIPLIB_DELEGATE],[ test "$have_ziplib" = 'yes'])
+AC_SUBST([ZIPLIB_CFLAGS])
+AC_SUBST([ZIPLIB_LIBS])
dnl ===========================================================================
@@ -1592,19 +1594,19 @@
ZLIB_PKG=""
if test "x$with_zlib" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(ZLIB,[zlib >= 1.0.0], have_zlib=yes, have_zlib=no)
+ PKG_CHECK_MODULES([ZLIB],[zlib >= 1.0.0],[have_zlib=yes],[have_zlib=no])
AC_MSG_RESULT([])
fi
if test "$have_zlib" = 'yes'; then
- AC_DEFINE(ZLIB_DELEGATE,1,Define if you have ZLIB library)
+ AC_DEFINE([ZLIB_DELEGATE],[1],[Define if you have ZLIB library])
CFLAGS="$ZLIB_CFLAGS $CFLAGS"
LIBS="$ZLIB_LIBS $LIBS"
fi
-AM_CONDITIONAL(ZLIB_DELEGATE, test "$have_zlib" = 'yes')
-AC_SUBST(ZLIB_CFLAGS)
-AC_SUBST(ZLIB_LIBS)
+AM_CONDITIONAL([ZLIB_DELEGATE],[ test "$have_zlib" = 'yes'])
+AC_SUBST([ZLIB_CFLAGS])
+AC_SUBST([ZLIB_LIBS])
dnl ===========================================================================
@@ -1627,19 +1629,19 @@
ZSTD_PKG=""
if test "x$with_zstd" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(LIBZSTD,[libzstd >= 1.0.0], have_zstd=yes, have_zstd=no)
+ PKG_CHECK_MODULES([LIBZSTD],[libzstd >= 1.0.0],[have_zstd=yes],[have_zstd=no])
AC_MSG_RESULT([])
fi
if test "$have_zstd" = 'yes'; then
- AC_DEFINE(ZSTD_DELEGATE,1,Define if you have ZSTD library)
+ AC_DEFINE([ZSTD_DELEGATE],[1],[Define if you have ZSTD library])
CFLAGS="$ZSTD_CFLAGS $CFLAGS"
LIBS="$ZSTD_LIBS $LIBS"
fi
-AM_CONDITIONAL(ZSTD_DELEGATE, test "$have_zstd" = 'yes')
-AC_SUBST(ZSTD_CFLAGS)
-AC_SUBST(ZSTD_LIBS)
+AM_CONDITIONAL([ZSTD_DELEGATE],[ test "$have_zstd" = 'yes'])
+AC_SUBST([ZSTD_CFLAGS])
+AC_SUBST([ZSTD_LIBS])
dnl ===========================================================================
@@ -1658,7 +1660,7 @@
failed=0
passed=0
AC_CHECK_HEADER([ltdl.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
- AC_CHECK_LIB([ltdl],[lt_dlinit],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],)
+ AC_CHECK_LIB([ltdl],[lt_dlinit],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
AC_MSG_CHECKING([if libltdl package is complete])
if test $passed -gt 0 ; then
if test $failed -gt 0 ; then
@@ -1667,7 +1669,7 @@
else
LTDL_LIBS='-lltdl'
LIBS="$LTDL_LIBS $LIBS"
- AC_DEFINE(LTDL_DELEGATE,1,[Define if using libltdl to support dynamically loadable modules and OpenCL])
+ AC_DEFINE([LTDL_DELEGATE],[1],[[Define if using libltdl to support dynamically loadable modules and OpenCL]])
AC_DEFINE_UNQUOTED([LTDL_MODULE_EXT],["${shrext_cmds}"],[Native module suffix])
AC_MSG_RESULT([yes])
have_ltdl='yes'
@@ -1679,17 +1681,17 @@
AC_MSG_FAILURE([libltdl is required for modules and OpenCL builds],[1])
fi
fi
-AM_CONDITIONAL(WITH_LTDL, test "$have_ltdl" != 'no')
+AM_CONDITIONAL([WITH_LTDL],[ test "$have_ltdl" != 'no'])
#
# If profiling, then check for -ldl and dlopen (required for Solaris & gcc)
#
LIB_DL=''
if test "$enable_profiling" = 'yes'; then
- AC_CHECK_LIB(dl,dlopen,LIB_DL='-ldl',,)
+ AC_CHECK_LIB([dl],[dlopen],[LIB_DL='-ldl'],[],[])
LIBS="$LIB_DL $LIBS"
fi
-AC_SUBST(LIB_DL)
+AC_SUBST([LIB_DL])
dnl ===========================================================================
@@ -1727,18 +1729,18 @@
AUTOTRACE_PKG=""
if test "x$with_autotrace" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(AUTOTRACE,[autotrace >= 0.31.2], have_autotrace=yes, have_autotrace=no)
+ PKG_CHECK_MODULES([AUTOTRACE],[autotrace >= 0.31.2],[have_autotrace=yes],[have_autotrace=no])
AC_MSG_RESULT([])
fi
if test "$have_autotrace" = 'yes'; then
- AC_DEFINE(AUTOTRACE_DELEGATE,1,Define if you have AUTOTRACE library)
+ AC_DEFINE([AUTOTRACE_DELEGATE],[1],[Define if you have AUTOTRACE library])
CFLAGS="$AUTOTRACE_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(AUTOTRACE_DELEGATE,test "$have_autotrace" = 'yes')
-AC_SUBST(AUTOTRACE_CFLAGS)
-AC_SUBST(AUTOTRACE_LIBS)
+AM_CONDITIONAL([AUTOTRACE_DELEGATE],[test "$have_autotrace" = 'yes'])
+AC_SUBST([AUTOTRACE_CFLAGS])
+AC_SUBST([AUTOTRACE_LIBS])
dnl ===========================================================================
@@ -1765,7 +1767,7 @@
passed=0
PERSIST_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I${ac_x_includes}/X11"
- AC_CHECK_HEADER(DPS/dpsXclient.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
+ AC_CHECK_HEADER([DPS/dpsXclient.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
# DPS issues:
# XFree86-4.x needs -lXt to provide XtMalloc for -ldps.
# Cygwin doesn't deliver -lXt as a DLL, which prevents a DLL build.
@@ -1773,11 +1775,11 @@
# ImageMagick itself doesn't use -lXt.
have_libdps='no'
LIBDPS_XT=''
- AC_CHECK_LIB(dps,DPSInitialize,have_libdps='yes',have_libdps='no',)
+ AC_CHECK_LIB([dps],[DPSInitialize],[have_libdps='yes'],[have_libdps='no',])
if test "$have_libdps" != 'yes'; then
# Unset cache variable so we can try again.
unset ac_cv_lib_dps_DPSInitialize
- AC_CHECK_LIB(dps,DPSInitialize,have_libdps='yes',have_libdps='no',-lXt)
+ AC_CHECK_LIB([dps],[DPSInitialize],[have_libdps='yes'],[have_libdps='no',-lXt])
if test "$have_libdps" = 'yes'; then
LIBDPS_XT='-lXt'
fi
@@ -1787,7 +1789,7 @@
else
failed=`expr $failed + 1`
fi
- AC_CHECK_LIB(dpstk,XDPSPixelsPerPoint,passed=`expr $passed + 1`,failed=`expr $failed + 1`,-ldps $LIBDPS_XT)
+ AC_CHECK_LIB([dpstk],[XDPSPixelsPerPoint],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`,-ldps $LIBDPS_XT])
AC_MSG_CHECKING([if DPS package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
@@ -1797,7 +1799,7 @@
else
DPS_LIBS="-ldpstk -ldps ${LIBDPS_XT}"
LIBS="$DPS_LIBS $LIBS"
- AC_DEFINE(DPS_DELEGATE,1,Define if you have Display Postscript)
+ AC_DEFINE([DPS_DELEGATE],[1],[Define if you have Display Postscript])
AC_MSG_RESULT([yes])
have_dps='yes'
fi
@@ -1806,8 +1808,8 @@
CPPFLAGS=$PERSIST_CPPFLAGS
fi
fi
-AM_CONDITIONAL(DPS_DELEGATE, test "$have_dps" = 'yes')
-AC_SUBST(DPS_LIBS)
+AM_CONDITIONAL([DPS_DELEGATE],[ test "$have_dps" = 'yes'])
+AC_SUBST([DPS_LIBS])
dnl ===========================================================================
@@ -1845,27 +1847,27 @@
FFTW_PKG=""
if test "x$with_fftw" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(fftw3,[fftw3 >= 3.0.0], have_fftw=yes, have_fftw=no)
+ PKG_CHECK_MODULES([fftw3],[fftw3 >= 3.0.0],[have_fftw=yes],[have_fftw=no])
AC_MSG_RESULT([])
fi
if test "$have_fftw" = 'yes'; then
- AC_DEFINE(FFTW_DELEGATE,1,Define if you have FFTW library)
+ AC_DEFINE([FFTW_DELEGATE],[1],[Define if you have FFTW library])
FFTW_CFLAGS="$fftw3_CFLAGS"
FFTW_LIBS="$fftw3_LIBS"
CFLAGS="$fftw3_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(FFTW_DELEGATE, test "$have_fftw" = 'yes')
-AC_SUBST(FFTW_CFLAGS)
-AC_SUBST(FFTW_LIBS)
+AM_CONDITIONAL([FFTW_DELEGATE],[ test "$have_fftw" = 'yes'])
+AC_SUBST([FFTW_CFLAGS])
+AC_SUBST([FFTW_LIBS])
dnl ===========================================================================
#
# Check for FLIF delegate library.
#
-AC_ARG_WITH(flif,
+AC_ARG_WITH([flif],
[AC_HELP_STRING([--without-flif],
[disable FLIF support])],
[with_flif=$withval],
@@ -1883,8 +1885,8 @@
AC_MSG_RESULT([])
failed=0
passed=0
- AC_CHECK_HEADER(flif.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_CHECK_LIB(flif,flif_create_decoder,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_HEADER([flif.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_LIB([flif],[flif_create_decoder],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
AC_MSG_CHECKING([if FLIF package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
@@ -1893,7 +1895,7 @@
else
FLIF_LIBS='-lflif'
LIBS="$FLIF_LIBS $LIBS"
- AC_DEFINE(FLIF_DELEGATE,1,Define if you have FLIF library)
+ AC_DEFINE([FLIF_DELEGATE],[1],[Define if you have FLIF library])
AC_MSG_RESULT([yes])
have_flif='yes'
fi
@@ -1901,8 +1903,8 @@
AC_MSG_RESULT([no])
fi
fi
-AM_CONDITIONAL(FLIF_DELEGATE,test "$have_flif" = 'yes')
-AC_SUBST(FLIF_LIBS)
+AM_CONDITIONAL([FLIF_DELEGATE],[test "$have_flif" = 'yes'])
+AC_SUBST([FLIF_LIBS])
dnl ===========================================================================
@@ -1927,9 +1929,10 @@
AC_MSG_RESULT([])
failed=0
passed=0
- AC_LANG_PUSH(C++)
- AC_CHECK_HEADER(fpxlib.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_LIB(fpx,FPX_OpenImageByFilename,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_LANG_PUSH([C++])
+ AC_CHECK_HEADER([fpxlib.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_LIB([fpx],[FPX_OpenImageByFilename],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
+
AC_LANG_POP
AC_MSG_CHECKING([if FlashPIX package is complete])
if test $passed -gt 0; then
@@ -1938,7 +1941,7 @@
have_fpx='no (failed tests)'
else
FPX_LIBS='-lfpx'
- AC_DEFINE(FPX_DELEGATE,1,Define if you have FlashPIX library)
+ AC_DEFINE([FPX_DELEGATE],[1],[Define if you have FlashPIX library])
AC_MSG_RESULT([yes])
have_fpx='yes'
PERLMAINCC="$CXX"
@@ -1947,8 +1950,8 @@
AC_MSG_RESULT([no])
fi
fi
-AM_CONDITIONAL(FPX_DELEGATE, test "$have_fpx" = 'yes')
-AC_SUBST(FPX_LIBS)
+AM_CONDITIONAL([FPX_DELEGATE],[ test "$have_fpx" = 'yes'])
+AC_SUBST([FPX_LIBS])
dnl ===========================================================================
@@ -1971,20 +1974,20 @@
DJVU_PKG=""
if test "x$with_djvu" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(ddjvuapi,[ddjvuapi >= 3.5.0], have_djvu=yes, have_djvu=no)
+ PKG_CHECK_MODULES([ddjvuapi],[ddjvuapi >= 3.5.0],[have_djvu=yes],[have_djvu=no])
AC_MSG_RESULT([])
fi
if test "$have_djvu" = 'yes'; then
- AC_DEFINE(DJVU_DELEGATE,1,Define if you have DJVU library)
+ AC_DEFINE([DJVU_DELEGATE],[1],[Define if you have DJVU library])
DJVU_CFLAGS="$ddjvuapi_CFLAGS"
DJVU_LIBS="$ddjvuapi_LIBS"
CFLAGS="$ddjvuapi_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(DJVU_DELEGATE, test "$have_djvu" = 'yes')
-AC_SUBST(DJVU_CFLAGS)
-AC_SUBST(DJVU_LIBS)
+AM_CONDITIONAL([DJVU_DELEGATE],[ test "$have_djvu" = 'yes'])
+AC_SUBST([DJVU_CFLAGS])
+AC_SUBST([DJVU_LIBS])
dnl ===========================================================================
@@ -2007,18 +2010,18 @@
FONTCONFIG_PKG=""
if test "x$with_fontconfig" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(FONTCONFIG,[fontconfig >= 2.1.0], have_fontconfig=yes, have_fontconfig=no)
+ PKG_CHECK_MODULES([FONTCONFIG],[fontconfig >= 2.1.0],[have_fontconfig=yes],[have_fontconfig=no])
AC_MSG_RESULT([])
fi
if test "$have_fontconfig" = 'yes'; then
- AC_DEFINE(FONTCONFIG_DELEGATE,1,Define if you have FONTCONFIG library)
+ AC_DEFINE([FONTCONFIG_DELEGATE],[1],[Define if you have FONTCONFIG library])
CFLAGS="$FONTCONFIG_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(FONTCONFIG_DELEGATE,test "$have_fontconfig" = 'yes')
-AC_SUBST(FONTCONFIG_CFLAGS)
-AC_SUBST(FONTCONFIG_LIBS)
+AM_CONDITIONAL([FONTCONFIG_DELEGATE],[test "$have_fontconfig" = 'yes'])
+AC_SUBST([FONTCONFIG_CFLAGS])
+AC_SUBST([FONTCONFIG_LIBS])
dnl ===========================================================================
@@ -2041,20 +2044,20 @@
FREETYPE_PKG=""
if test "x$with_freetype" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(FREETYPE,[freetype2], have_freetype=yes, have_freetype=no)
+ PKG_CHECK_MODULES([FREETYPE],[freetype2],[have_freetype=yes],[have_freetype=no])
AC_MSG_RESULT([])
fi
if test "$have_freetype" = 'yes'; then
- AC_DEFINE(FREETYPE_DELEGATE,1,Define if you have FREETYPE library)
+ AC_DEFINE([FREETYPE_DELEGATE],[1],[Define if you have FREETYPE library])
CFLAGS="$FREETYPE_CFLAGS $CFLAGS"
MAGICKCORE_FREETYPE_DELEGATE=1
else
MAGICKCORE_FREETYPE_DELEGATE=0
fi
-AC_SUBST(FREETYPE_CFLAGS)
-AC_SUBST(FREETYPE_LIBS)
+AC_SUBST([FREETYPE_CFLAGS])
+AC_SUBST([FREETYPE_LIBS])
AC_SUBST([MAGICKCORE_FREETYPE_DELEGATE])
dnl ===========================================================================
@@ -2078,18 +2081,18 @@
RAQM_PKG=""
if test "x$with_raqm" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(RAQM,[raqm], have_raqm=yes, have_raqm=no)
+ PKG_CHECK_MODULES([RAQM],[raqm],[have_raqm=yes],[have_raqm=no])
AC_MSG_RESULT([])
fi
if test "$have_raqm" = 'yes'; then
- AC_DEFINE(RAQM_DELEGATE,1,Define if you have RAQM library)
+ AC_DEFINE([RAQM_DELEGATE],[1],[Define if you have RAQM library])
CFLAGS="$RAQM_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(RAQM_DELEGATE, test "$have_raqm" = 'yes')
-AC_SUBST(RAQM_CFLAGS)
-AC_SUBST(RAQM_LIBS)
+AM_CONDITIONAL([RAQM_DELEGATE],[ test "$have_raqm" = 'yes'])
+AC_SUBST([RAQM_CFLAGS])
+AC_SUBST([RAQM_LIBS])
dnl ===========================================================================
@@ -2119,12 +2122,12 @@
framework=0
failed=0
passed=0
- AC_CHECK_HEADER(ghostscript/iapi.h,passed=`expr $passed + 1`,
- failed=`expr $failed + 1`,)
- AC_CHECK_HEADER(ghostscript/ierrors.h,passed=`expr $passed + 1`,
- failed=`expr $failed + 1`,)
- AC_CHECK_FRAMEWORK(Ghostscript,gsapi_new_instance,framework=`expr $framework + 1`,
- AC_CHECK_LIB(gs,gsapi_new_instance,passed=`expr $passed + 1`,failed=`expr $failed + 1`,),)
+ AC_CHECK_HEADER([ghostscript/iapi.h],[passed=`expr $passed + 1`],
+ [failed=`expr $failed + 1`],[])
+ AC_CHECK_HEADER([ghostscript/ierrors.h],[passed=`expr $passed + 1`],
+ [failed=`expr $failed + 1`],[])
+ AC_CHECK_FRAMEWORK([Ghostscript],[gsapi_new_instance],[framework=`expr $framework + 1`],
+ AC_CHECK_LIB([gs],[gsapi_new_instance],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[]),[])
AC_MSG_CHECKING([if Ghostscript package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
@@ -2140,15 +2143,15 @@
GS_LIBS='-lgs'
fi
LIBS="$GS_LIBS $LIBS"
- AC_DEFINE(GS_DELEGATE,1,Define if you have Ghostscript library or framework)
+ AC_DEFINE([GS_DELEGATE],[1],[Define if you have Ghostscript library or framework])
have_gslib='yes'
fi
else
AC_MSG_RESULT([no])
fi
fi
-AM_CONDITIONAL(GS_DELEGATE, test "$have_gslib" = 'yes')
-AC_SUBST(GS_LIBS)
+AM_CONDITIONAL([GS_DELEGATE],[ test "$have_gslib" = 'yes'])
+AC_SUBST([GS_LIBS])
# Set default font search path
AC_ARG_WITH([fontpath],
@@ -2160,7 +2163,7 @@
if test "$with_fontpath" != "yes" && test -z "$with_fontpath"; then
with_fontpath=''
else
- AC_DEFINE_UNQUOTED(MAGICK_FONT_PATH,"$with_fontpath",[Define to prepend to default font search path.])
+ AC_DEFINE_UNQUOTED([MAGICK_FONT_PATH],["$with_fontpath"],[Define to prepend to default font search path.])
fi
if test "$with_fontpath=" != ''; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-fontpath=$with_fontpath "
@@ -2182,7 +2185,7 @@
#
# Check for GVC delegate library.
#
-AC_ARG_WITH(gvc,
+AC_ARG_WITH([gvc],
[AC_HELP_STRING([--with-gvc],
[enable GVC support])],
[with_gvc=$withval],
@@ -2195,18 +2198,18 @@
GVC_PKG=""
if test "x$with_gvc" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(GVC,[libgvc >= 2.9.0], have_gvc=yes, have_gvc=no)
+ PKG_CHECK_MODULES([GVC],[libgvc >= 2.9.0],[have_gvc=yes],[have_gvc=no])
AC_MSG_RESULT([])
fi
if test "$have_gvc" = 'yes'; then
- AC_DEFINE(GVC_DELEGATE,1,Define if you have GVC library)
+ AC_DEFINE([GVC_DELEGATE],[1],[Define if you have GVC library])
CFLAGS="$GVC_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(GVC_DELEGATE, test "$have_gvc" = 'yes')
-AC_SUBST(GVC_CFLAGS)
-AC_SUBST(GVC_LIBS)
+AM_CONDITIONAL([GVC_DELEGATE],[ test "$have_gvc" = 'yes'])
+AC_SUBST([GVC_CFLAGS])
+AC_SUBST([GVC_LIBS])
dnl ===========================================================================
@@ -2229,18 +2232,18 @@
HEIF_PKG=""
if test "x$with_heic" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(HEIF,[libheif], have_heic=yes, have_heic=no)
+ PKG_CHECK_MODULES([HEIF],[libheif],[have_heic=yes],[have_heic=no])
AC_MSG_RESULT([])
fi
if test "$have_heic" = 'yes'; then
- AC_DEFINE(HEIC_DELEGATE,1,Define if you have libheif library)
+ AC_DEFINE([HEIC_DELEGATE],[1],[Define if you have libheif library])
CFLAGS="$HEIF_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(HEIC_DELEGATE, test "$have_heic" = 'yes')
-AC_SUBST(HEIF_CFLAGS)
-AC_SUBST(HEIF_LIBS)
+AM_CONDITIONAL([HEIC_DELEGATE],[ test "$have_heic" = 'yes'])
+AC_SUBST([HEIF_CFLAGS])
+AC_SUBST([HEIF_LIBS])
dnl ===========================================================================
@@ -2261,8 +2264,9 @@
AC_MSG_RESULT([])
failed=0
passed=0
- AC_CHECK_HEADER(jbig.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_LIB(jbig,jbg_dec_init,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_HEADER([jbig.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_LIB([jbig],[jbg_dec_init],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
+
AC_MSG_CHECKING([if JBIG package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
@@ -2271,7 +2275,7 @@
else
JBIG_LIBS='-ljbig'
LIBS="$JBIG_LIBS $LIBS"
- AC_DEFINE(JBIG_DELEGATE,1,Define if you have JBIG library)
+ AC_DEFINE([JBIG_DELEGATE],[1],[Define if you have JBIG library])
AC_MSG_RESULT([yes])
have_jbig='yes'
fi
@@ -2279,8 +2283,8 @@
AC_MSG_RESULT([no])
fi
fi
-AM_CONDITIONAL(JBIG_DELEGATE, test "$have_jbig" = 'yes')
-AC_SUBST(JBIG_LIBS)
+AM_CONDITIONAL([JBIG_DELEGATE],[ test "$have_jbig" = 'yes'])
+AC_SUBST([JBIG_LIBS])
dnl ===========================================================================
@@ -2305,11 +2309,12 @@
AC_MSG_RESULT([])
failed=0
passed=0
- AC_CHECK_HEADER(jconfig.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_HEADER(jerror.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_HEADER(jmorecfg.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_HEADER(jpeglib.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_LIB(jpeg,jpeg_read_header,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_HEADER([jconfig.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_HEADER([jerror.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_HEADER([jmorecfg.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_HEADER([jpeglib.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_LIB([jpeg],[jpeg_read_header],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
+
AC_MSG_CHECKING([if JPEG package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
@@ -2318,7 +2323,7 @@
else
JPEG_LIBS='-ljpeg'
LIBS="$JPEG_LIBS $LIBS"
- AC_DEFINE(JPEG_DELEGATE,1,Define if you have JPEG library)
+ AC_DEFINE([JPEG_DELEGATE],[1],[Define if you have JPEG library])
AC_MSG_RESULT([yes])
have_jpeg='yes'
fi
@@ -2326,8 +2331,8 @@
AC_MSG_RESULT([no])
fi
fi
-AM_CONDITIONAL(JPEG_DELEGATE, test "$have_jpeg" = 'yes')
-AC_SUBST(JPEG_LIBS)
+AM_CONDITIONAL([JPEG_DELEGATE],[ test "$have_jpeg" = 'yes'])
+AC_SUBST([JPEG_LIBS])
dnl ===========================================================================
@@ -2354,10 +2359,12 @@
AC_MSG_RESULT([])
failed=0
passed=0
- AC_CHECK_HEADER(brunsli/decode.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_HEADER(brunsli/encode.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_LIB(brunslidec-c,DecodeBrunsli,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_CHECK_LIB(brunslienc-c,EncodeBrunsli,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_HEADER([brunsli/decode.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_HEADER([brunsli/encode.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_LIB([brunslidec-c],[DecodeBrunsli],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
+
+ AC_CHECK_LIB([brunslienc-c],[EncodeBrunsli],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
+
AC_MSG_CHECKING([if brunsli package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
@@ -2366,7 +2373,7 @@
else
JXL_LIBS='-lbrunslidec-c -lbrunslienc-c'
LIBS="$JXL_LIBS $LIBS"
- AC_DEFINE(JXL_DELEGATE,1,Define if you have brunsli library)
+ AC_DEFINE([JXL_DELEGATE],[1],[Define if you have brunsli library])
AC_MSG_RESULT([yes])
have_jxl='yes'
fi
@@ -2374,15 +2381,15 @@
AC_MSG_RESULT([no])
fi
fi
-AM_CONDITIONAL(JXL_DELEGATE, test "$have_jxl" = 'yes')
-AC_SUBST(JXL_LIBS)
+AM_CONDITIONAL([JXL_DELEGATE],[ test "$have_jxl" = 'yes'])
+AC_SUBST([JXL_LIBS])
dnl ===========================================================================
#
# Check for LCMS delegate library.
#
-AC_ARG_WITH(lcms,
+AC_ARG_WITH([lcms],
[ --without-lcms disable lcms (v1.1X) support],
[with_lcms=$withval],
[with_lcms='yes'])
@@ -2396,26 +2403,26 @@
LCMS_PKG=""
if test "x$with_lcms" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(LCMS2,[lcms2 >= 2.0.0], have_lcms=yes, have_lcms=no)
+ PKG_CHECK_MODULES([LCMS2],[lcms2 >= 2.0.0],[have_lcms=yes],[have_lcms=no])
AC_MSG_RESULT([])
fi
if test "$have_lcms" = 'yes'; then
- AC_DEFINE(LCMS_DELEGATE,1,Define if you have LCMS library)
+ AC_DEFINE([LCMS_DELEGATE],[1],[Define if you have LCMS library])
LCMS_CFLAGS="$LCMS2_CFLAGS"
LCMS_LIBS="$LCMS2_LIBS"
CFLAGS="$LCMS2_CFLAGS $CFLAGS"
- AC_CHECK_HEADER(lcms2/lcms2.h,have_lcms_header='yes',,)
+ AC_CHECK_HEADER([lcms2/lcms2.h],[have_lcms_header='yes'],[])
if test "$have_lcms_header" = 'yes'; then
- AC_DEFINE(HAVE_LCMS2_LCMS2_H,1,Define if you have the <lcms2/lcms2.h> header file.)
+ AC_DEFINE([HAVE_LCMS2_LCMS2_H],[1],[Define if you have the <lcms2/lcms2.h> header file.])
else
- AC_DEFINE(HAVE_LCMS2_H,1,Define if you have the <lcms2.h> header file.)
+ AC_DEFINE([HAVE_LCMS2_H],[1],[Define if you have the <lcms2.h> header file.])
fi
fi
-AM_CONDITIONAL(LCMS_DELEGATE, test "$have_lcms" = 'yes')
-AC_SUBST(LCMS_CFLAGS)
-AC_SUBST(LCMS_LIBS)
+AM_CONDITIONAL([LCMS_DELEGATE],[ test "$have_lcms" = 'yes'])
+AC_SUBST([LCMS_CFLAGS])
+AC_SUBST([LCMS_LIBS])
dnl ===========================================================================
@@ -2438,18 +2445,18 @@
LIBOPENJP2_PKG=""
if test "$with_openjp2" != 'no'; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(LIBOPENJP2,[libopenjp2 >= 2.1.0], have_openjp2=yes, have_openjp2=no)
+ PKG_CHECK_MODULES([LIBOPENJP2],[libopenjp2 >= 2.1.0],[have_openjp2=yes],[have_openjp2=no])
AC_MSG_RESULT([])
fi
if test "$have_openjp2" = 'yes'; then
- AC_DEFINE(LIBOPENJP2_DELEGATE,1,Define if you have OPENJP2 library)
+ AC_DEFINE([LIBOPENJP2_DELEGATE],[1],[Define if you have OPENJP2 library])
CFLAGS="$LIBOPENJP2_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(LIBOPENJP2_DELEGATE, test "$have_openjp2" = 'yes')
-AC_SUBST(LIBOPENJP2_CFLAGS)
-AC_SUBST(LIBOPENJP2_LIBS)
+AM_CONDITIONAL([LIBOPENJP2_DELEGATE],[ test "$have_openjp2" = 'yes'])
+AC_SUBST([LIBOPENJP2_CFLAGS])
+AC_SUBST([LIBOPENJP2_LIBS])
dnl ===========================================================================
@@ -2473,23 +2480,23 @@
LQR_PKG=""
if test "x$with_lqr" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(LQR,[lqr-1 >= 0.1.0], have_lqr=yes, have_lqr=no)
+ PKG_CHECK_MODULES([LQR],[lqr-1 >= 0.1.0],[have_lqr=yes],[have_lqr=no])
AC_MSG_RESULT([])
fi
if test "$have_lqr" = 'yes'; then
- AC_DEFINE(LQR_DELEGATE,1,Define if you have LQR library)
+ AC_DEFINE([LQR_DELEGATE],[1],[Define if you have LQR library])
CFLAGS="$LQR_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(LQR_DELEGATE, test "$have_lqr" = 'yes')
-AC_SUBST(LQR_CFLAGS)
-AC_SUBST(LQR_LIBS)
+AM_CONDITIONAL([LQR_DELEGATE],[ test "$have_lqr" = 'yes'])
+AC_SUBST([LQR_CFLAGS])
+AC_SUBST([LQR_LIBS])
dnl ===========================================================================
# Disable LZMA (lzma library)
-AC_ARG_WITH(lzma,
+AC_ARG_WITH([lzma],
[ --without-lzma disable LZMA support],
[with_lzma=$withval],
[with_lzma='yes'])
@@ -2500,20 +2507,20 @@
LZMA_PKG=""
if test "x$with_lzma" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(LZMA,[liblzma >= 2.9.0], have_lzma=yes, have_lzma=no)
+ PKG_CHECK_MODULES([LZMA],[liblzma >= 2.9.0],[have_lzma=yes],[have_lzma=no])
AC_MSG_RESULT([])
else
have_lzma=no
fi
if test "$have_lzma" = 'yes'; then
- AC_DEFINE(LZMA_DELEGATE,1,Define if you have LZMA library)
+ AC_DEFINE([LZMA_DELEGATE],[1],[Define if you have LZMA library])
CFLAGS="$LZMA_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(LZMA_DELEGATE, test "$have_lzma" = 'yes')
-AC_SUBST(LZMA_CFLAGS)
-AC_SUBST(LZMA_LIBS)
+AM_CONDITIONAL([LZMA_DELEGATE],[ test "$have_lzma" = 'yes'])
+AC_SUBST([LZMA_CFLAGS])
+AC_SUBST([LZMA_LIBS])
dnl ===========================================================================
@@ -2536,18 +2543,18 @@
OPENEXR_PKG=""
if test "x$with_openexr" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(OPENEXR,[OpenEXR >= 1.0.6], have_openexr=yes, have_openexr=no)
+ PKG_CHECK_MODULES([OPENEXR],[OpenEXR >= 1.0.6],[have_openexr=yes],[have_openexr=no])
AC_MSG_RESULT([])
fi
if test "$have_openexr" = 'yes'; then
- AC_DEFINE(OPENEXR_DELEGATE,1,Define if you have OPENEXR library)
+ AC_DEFINE([OPENEXR_DELEGATE],[1],[Define if you have OPENEXR library])
CFLAGS="$OPENEXR_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(OPENEXR_DELEGATE, test "$have_openexr" = 'yes')
-AC_SUBST(OPENEXR_CFLAGS)
-AC_SUBST(OPENEXR_LIBS)
+AM_CONDITIONAL([OPENEXR_DELEGATE],[ test "$have_openexr" = 'yes'])
+AC_SUBST([OPENEXR_CFLAGS])
+AC_SUBST([OPENEXR_LIBS])
dnl ===========================================================================
@@ -2571,33 +2578,33 @@
PANGO_PKG=""
if test "x$with_pango" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(PANGO, [pangocairo >= 1.28.1], have_pangocairo=yes, have_pangocairo=no)
+ PKG_CHECK_MODULES([PANGO],[pangocairo >= 1.28.1],[have_pangocairo=yes],[have_pangocairo=no])
AC_MSG_RESULT([])
- PKG_CHECK_MODULES(PANGO, [pango >= 1.28.1], have_pango=yes, have_pango=no)
+ PKG_CHECK_MODULES([PANGO],[pango >= 1.28.1],[have_pango=yes],[have_pango=no])
AC_MSG_RESULT([])
fi
if test "$have_pango" = 'yes'; then
- AC_DEFINE(PANGO_DELEGATE,1,Define if you have PANGO library)
+ AC_DEFINE([PANGO_DELEGATE],[1],[Define if you have PANGO library])
CFLAGS="$PANGO_CFLAGS $CFLAGS"
fi
if test "$have_pangocairo" = 'yes'; then
- AC_DEFINE(PANGOCAIRO_DELEGATE,1,Define if you have PANGOCAIRO library)
+ AC_DEFINE([PANGOCAIRO_DELEGATE],[1],[Define if you have PANGOCAIRO library])
CFLAGS="$PANGOCAIRO_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(PANGO_DELEGATE, test "$have_pango" = 'yes')
-AM_CONDITIONAL(PANGOCAIRO_DELEGATE, test "$have_pangocairo" = 'yes')
-AC_SUBST(PANGO_CFLAGS)
-AC_SUBST(PANGO_LIBS)
+AM_CONDITIONAL([PANGO_DELEGATE],[ test "$have_pango" = 'yes'])
+AM_CONDITIONAL([PANGOCAIRO_DELEGATE],[ test "$have_pangocairo" = 'yes'])
+AC_SUBST([PANGO_CFLAGS])
+AC_SUBST([PANGO_LIBS])
dnl ===========================================================================
#
# Check for PNG delegate library.
#
-AC_ARG_WITH(png,
+AC_ARG_WITH([png],
[AC_HELP_STRING([--without-png], [disable PNG support])],
[with_png=$withval],
[with_png='yes'])
@@ -2612,18 +2619,18 @@
PNG_PKG=""
if test "x$with_png" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(PNG,[libpng >= 1.0.0], have_png=yes, have_png=no)
+ PKG_CHECK_MODULES([PNG],[libpng >= 1.0.0],[have_png=yes],[have_png=no])
AC_MSG_RESULT([])
fi
if test "$have_png" = 'yes'; then
- AC_DEFINE(PNG_DELEGATE,1,Define if you have PNG library)
+ AC_DEFINE([PNG_DELEGATE],[1],[Define if you have PNG library])
CFLAGS="$PNG_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(PNG_DELEGATE, test "$have_png" = 'yes')
-AC_SUBST(PNG_CFLAGS)
-AC_SUBST(PNG_LIBS)
+AM_CONDITIONAL([PNG_DELEGATE],[ test "$have_png" = 'yes'])
+AC_SUBST([PNG_CFLAGS])
+AC_SUBST([PNG_LIBS])
dnl ===========================================================================
@@ -2646,18 +2653,18 @@
RAW_R_PKG=""
if test "x$with_raw" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(RAW_R,[libraw_r >= 0.14.8], have_raw=yes, have_raw=no)
+ PKG_CHECK_MODULES([RAW_R],[libraw_r >= 0.14.8],[have_raw=yes],[have_raw=no])
AC_MSG_RESULT([])
fi
if test "$have_raw" = 'yes'; then
- AC_DEFINE(RAW_R_DELEGATE,1,Define if you have LIBRAW library)
+ AC_DEFINE([RAW_R_DELEGATE],[1],[Define if you have LIBRAW library])
CFLAGS="$RAW_R_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(RAW_R_DELEGATE, test "$have_raw" = 'yes')
-AC_SUBST(RAW_R_CFLAGS)
-AC_SUBST(RAW_R_LIBS)
+AM_CONDITIONAL([RAW_R_DELEGATE],[ test "$have_raw" = 'yes'])
+AC_SUBST([RAW_R_CFLAGS])
+AC_SUBST([RAW_R_LIBS])
dnl ===========================================================================
@@ -2681,26 +2688,26 @@
RSVG_PKG=""
if test "x$with_rsvg" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(RSVG,[librsvg-2.0 >= 2.9.0], have_rsvg=yes, have_rsvg=no)
+ PKG_CHECK_MODULES([RSVG],[librsvg-2.0 >= 2.9.0],[have_rsvg=yes],[have_rsvg=no])
AC_MSG_RESULT([])
- PKG_CHECK_MODULES(CAIRO_SVG, cairo-svg, have_cairo=yes, have_cairo=no)
+ PKG_CHECK_MODULES([CAIRO_SVG],[cairo-svg],[have_cairo=yes],[have_cairo=no])
AC_MSG_RESULT([])
fi
if test "$have_rsvg" = 'yes'; then
- AC_DEFINE(RSVG_DELEGATE,1,Define if you have RSVG library)
+ AC_DEFINE([RSVG_DELEGATE],[1],[Define if you have RSVG library])
CFLAGS="$RSVG_CFLAGS $CFLAGS"
fi
if test "$have_cairo" = 'yes'; then
- AC_DEFINE(CAIRO_DELEGATE,1,Define if you have CAIRO library)
+ AC_DEFINE([CAIRO_DELEGATE],[1],[Define if you have CAIRO library])
CFLAGS="$CAIRO_SVG_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(RSVG_DELEGATE, test "$have_rsvg" = 'yes')
-AM_CONDITIONAL(CAIRO_DELEGATE, test "$have_cairo" = 'yes')
-AC_SUBST(RSVG_CFLAGS)
-AC_SUBST(RSVG_LIBS)
+AM_CONDITIONAL([RSVG_DELEGATE],[ test "$have_rsvg" = 'yes'])
+AM_CONDITIONAL([CAIRO_DELEGATE],[ test "$have_cairo" = 'yes'])
+AC_SUBST([RSVG_CFLAGS])
+AC_SUBST([RSVG_LIBS])
dnl ===========================================================================
@@ -2725,13 +2732,13 @@
AC_MSG_RESULT([])
failed=0
passed=0
- AC_CHECK_HEADER(tiff.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_HEADER(tiffio.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
- AC_CHECK_LIB(tiff,TIFFOpen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_CHECK_LIB(tiff,TIFFClientOpen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_CHECK_LIB(tiff,TIFFIsByteSwapped,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_CHECK_LIB(tiff,TIFFReadRGBATile,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
- AC_CHECK_LIB(tiff,TIFFReadRGBAStrip,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
+ AC_CHECK_HEADER([tiff.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_HEADER([tiffio.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+ AC_CHECK_LIB([tiff],[TIFFOpen],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
+ AC_CHECK_LIB([tiff],[TIFFClientOpen],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
+ AC_CHECK_LIB([tiff],[TIFFIsByteSwapped],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
+ AC_CHECK_LIB([tiff],[TIFFReadRGBATile],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
+ AC_CHECK_LIB([tiff],[TIFFReadRGBAStrip],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
AC_MSG_CHECKING([if TIFF package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
@@ -2740,7 +2747,7 @@
else
TIFF_LIBS='-ltiff'
LIBS="$TIFF_LIBS $LIBS"
- AC_DEFINE(TIFF_DELEGATE,1,Define if you have TIFF library)
+ AC_DEFINE([TIFF_DELEGATE],[1],[Define if you have TIFF library])
AC_MSG_RESULT([yes])
have_tiff='yes'
AC_CHECK_HEADERS(tiffconf.h)
@@ -2753,8 +2760,8 @@
AC_MSG_RESULT([no])
fi
fi
-AM_CONDITIONAL(TIFF_DELEGATE, test "$have_tiff" = 'yes')
-AC_SUBST(TIFF_LIBS)
+AM_CONDITIONAL([TIFF_DELEGATE],[ test "$have_tiff" = 'yes'])
+AC_SUBST([TIFF_LIBS])
dnl ===========================================================================
@@ -2796,27 +2803,27 @@
WEBPMUX_PKG=""
if test "x$with_webp" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(WEBP,[libwebp], have_webp=yes, have_webp=no)
- PKG_CHECK_MODULES(WEBPMUX,[libwebpmux >= 0.5.0 libwebpdemux >= 0.5.0], have_webpmux=yes, have_webpmux=no)
+ PKG_CHECK_MODULES([WEBP],[libwebp],[have_webp=yes],[have_webp=no])
+ PKG_CHECK_MODULES([WEBPMUX],[libwebpmux >= 0.5.0 libwebpdemux >= 0.5.0],[have_webpmux=yes],[have_webpmux=no])
AC_MSG_RESULT([])
fi
if test "$have_webp" = 'yes'; then
- AC_DEFINE(WEBP_DELEGATE,1,Define if you have WEBP library)
+ AC_DEFINE([WEBP_DELEGATE],[1],[Define if you have WEBP library])
CFLAGS="$WEBP_CFLAGS $CFLAGS"
fi
if test "$have_webpmux" = 'yes'; then
- AC_DEFINE(WEBPMUX_DELEGATE,1,Define if you have WEBPMUX library)
+ AC_DEFINE([WEBPMUX_DELEGATE],[1],[Define if you have WEBPMUX library])
CFLAGS="$WEBPMUX_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(WEBP_DELEGATE, test "$have_webp" = 'yes')
-AM_CONDITIONAL(WEBPMUX_DELEGATE, test "$have_webpmux" = 'yes')
-AC_SUBST(WEBPMUX_CFLAGS)
-AC_SUBST(WEBPMUX_LIBS)
-AC_SUBST(WEBP_CFLAGS)
-AC_SUBST(WEBP_LIBS)
+AM_CONDITIONAL([WEBP_DELEGATE],[ test "$have_webp" = 'yes'])
+AM_CONDITIONAL([WEBPMUX_DELEGATE],[ test "$have_webpmux" = 'yes'])
+AC_SUBST([WEBPMUX_CFLAGS])
+AC_SUBST([WEBPMUX_LIBS])
+AC_SUBST([WEBP_CFLAGS])
+AC_SUBST([WEBP_LIBS])
dnl ===========================================================================
@@ -2863,7 +2870,7 @@
if test "$have_libwmf_ipa_h" = 'yes'; then
AC_CHECK_LIB([wmflite],[wmf_lite_create],[have_libwmflite='yes'],[],[])
if test "$have_libwmflite" = 'yes'; then
- AC_DEFINE(WMF_DELEGATE,1,Define if you have WMF library)
+ AC_DEFINE([WMF_DELEGATE],[1],[Define if you have WMF library])
WMF_LIBS='-lwmflite'
LIBS="$WMF_LIBS $LIBS"
have_wmf='yes'
@@ -2882,7 +2889,7 @@
else
AC_MSG_RESULT([no])
fi
-AM_CONDITIONAL([WMF_DELEGATE], [test "$have_wmf" = 'yes'])
+AM_CONDITIONAL([WMF_DELEGATE],[test "$have_wmf" = 'yes'])
AC_SUBST([WMF_CFLAGS])
AC_SUBST([WMF_LIBS])
@@ -2907,18 +2914,18 @@
XML_PKG=""
if test "x$with_xml" = "xyes"; then
AC_MSG_RESULT([-------------------------------------------------------------])
- PKG_CHECK_MODULES(XML,[libxml-2.0 >= 2.0.0], have_xml=yes, have_xml=no)
+ PKG_CHECK_MODULES([XML],[libxml-2.0 >= 2.0.0],[have_xml=yes],[have_xml=no])
AC_MSG_RESULT([])
fi
if test "$have_xml" = 'yes'; then
- AC_DEFINE(XML_DELEGATE,1,Define if you have XML library)
+ AC_DEFINE([XML_DELEGATE],[1],[Define if you have XML library])
CFLAGS="$XML_CFLAGS $CFLAGS"
fi
-AM_CONDITIONAL(XML_DELEGATE, test "$have_xml" = 'yes')
-AC_SUBST(XML_CFLAGS)
-AC_SUBST(XML_LIBS)
+AM_CONDITIONAL([XML_DELEGATE],[ test "$have_xml" = 'yes'])
+AC_SUBST([XML_CFLAGS])
+AC_SUBST([XML_LIBS])
dnl ===========================================================================
@@ -2943,8 +2950,8 @@
DEFINE_INCLUDE_PATH=`$WinPathScript "$DEFINE_INCLUDE_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(INCLUDE_PATH,"$DEFINE_INCLUDE_PATH",[Directory where ImageMagick headers live.])
-AC_SUBST(INCLUDE_PATH)
+AC_DEFINE_UNQUOTED([INCLUDE_PATH],["$DEFINE_INCLUDE_PATH"],[Directory where ImageMagick headers live.])
+AC_SUBST([INCLUDE_PATH])
# Path to ImageMagick header files (arch part)
INCLUDEARCH_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}"
@@ -2954,12 +2961,12 @@
DEFINE_INCLUDEARCH_PATH=`$WinPathScript "$DEFINE_INCLUDEARCH_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(INCLUDEARCH_PATH,"$DEFINE_INCLUDE_PATH",[Directory where ImageMagick architecture headers live.])
-AC_SUBST(INCLUDEARCH_PATH)
+AC_DEFINE_UNQUOTED([INCLUDEARCH_PATH],["$DEFINE_INCLUDE_PATH"],[Directory where ImageMagick architecture headers live.])
+AC_SUBST([INCLUDEARCH_PATH])
# Subdirectory under lib to place ImageMagick lib files
LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-AC_DEFINE_UNQUOTED(LIBRARY_RELATIVE_PATH,"$LIBRARY_RELATIVE_PATH",[Subdirectory of lib where ImageMagick architecture dependent files are installed.])
+AC_DEFINE_UNQUOTED([LIBRARY_RELATIVE_PATH],["$LIBRARY_RELATIVE_PATH"],[Subdirectory of lib where ImageMagick architecture dependent files are installed.])
# Path to ImageMagick bin directory
EXECUTABLE_PATH="${BIN_DIR}"
@@ -2969,8 +2976,8 @@
DEFINE_EXECUTABLE_PATH=`$WinPathScript "$DEFINE_EXECUTABLE_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(EXECUTABLE_PATH,"$DEFINE_EXECUTABLE_PATH",[Directory where executables are installed.])
-AC_SUBST(EXECUTABLE_PATH)
+AC_DEFINE_UNQUOTED([EXECUTABLE_PATH],["$DEFINE_EXECUTABLE_PATH"],[Directory where executables are installed.])
+AC_SUBST([EXECUTABLE_PATH])
# Path to ImageMagick lib
LIBRARY_PATH="${LIB_DIR}/${LIBRARY_RELATIVE_PATH}"
@@ -2980,58 +2987,58 @@
DEFINE_LIBRARY_PATH=`$WinPathScript "$DEFINE_LIBRARY_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_LIBRARY_PATH",[Directory where architecture-dependent files live.])
-AC_SUBST(LIBRARY_PATH)
+AC_DEFINE_UNQUOTED([LIBRARY_PATH],["$DEFINE_LIBRARY_PATH"],[Directory where architecture-dependent files live.])
+AC_SUBST([LIBRARY_PATH])
#
# path to local binaries
if test "x$LIB_BIN_BASEDIRNAME" = "x"; then
LIB_BIN_BASEDIRNAME="bin"
fi
-AC_DEFINE_UNQUOTED(LIB_BIN_BASEDIRNAME,"$LIB_BIN_BASEDIRNAME",[Binaries in libraries path base name (will be during install linked to bin)])
-AC_SUBST(LIB_BIN_BASEDIRNAME)
+AC_DEFINE_UNQUOTED([LIB_BIN_BASEDIRNAME],["$LIB_BIN_BASEDIRNAME"],[Binaries in libraries path base name (will be during install linked to bin)])
+AC_SUBST([LIB_BIN_BASEDIRNAME])
if test "x$LIB_BIN_DIR" = "x"; then
LIB_BIN_DIR=${LIB_BIN_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
fi
-AC_SUBST(LIB_BIN_DIR)
+AC_SUBST([LIB_BIN_DIR])
LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR
-AC_SUBST(LIB_BIN_DIR_RELATIVE_PATH)
+AC_SUBST([LIB_BIN_DIR_RELATIVE_PATH])
LIB_BIN_DIR_PATH="${LIBRARY_PATH}/${LIB_BIN_DIR_RELATIVE_PATH}"
-AC_SUBST(LIB_BIN_DIR_PATH)
+AC_SUBST([LIB_BIN_DIR_PATH])
#
# path to modules lib
if test "x$MODULES_BASEDIRNAME" = "x"; then
MODULES_BASEDIRNAME="modules"
fi
-AC_DEFINE_UNQUOTED(MODULES_BASEDIRNAME,"$MODULES_BASEDIRNAME",[Module directory name without ABI part.])
-AC_SUBST(MODULES_BASEDIRNAME)
+AC_DEFINE_UNQUOTED([MODULES_BASEDIRNAME],["$MODULES_BASEDIRNAME"],[Module directory name without ABI part.])
+AC_SUBST([MODULES_BASEDIRNAME])
if test "x$MODULES_DIRNAME" = "x"; then
MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
else
- AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",[Module directory dirname])
+ AC_DEFINE_UNQUOTED([MODULES_DIRNAME],["$MODULES_DIRNAME"],[Module directory dirname])
fi
-AC_SUBST(MODULES_DIRNAME)
+AC_SUBST([MODULES_DIRNAME])
MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
-AC_SUBST(MODULES_RELATIVE_PATH)
+AC_SUBST([MODULES_RELATIVE_PATH])
MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}"
-AC_SUBST(MODULES_PATH)
+AC_SUBST([MODULES_PATH])
#
# path to coders lib
if test "x$CODER_DIRNAME" = "x"; then
CODER_DIRNAME="coders"
fi
-AC_DEFINE_UNQUOTED(CODER_DIRNAME,"$CODER_DIRNAME",[coders subdirectory.])
-AC_SUBST(CODER_DIRNAME)
+AC_DEFINE_UNQUOTED([CODER_DIRNAME],["$CODER_DIRNAME"],[coders subdirectory.])
+AC_SUBST([CODER_DIRNAME])
CODER_RELATIVE_PATH="${CODER_DIRNAME}"
CODER_PATH="${MODULES_PATH}/${CODER_DIRNAME}"
-AC_SUBST(CODER_PATH)
+AC_SUBST([CODER_PATH])
#
# Subdirectory under lib to place ImageMagick filter module files
@@ -3040,12 +3047,12 @@
if test "x$FILTER_DIRNAME" = "x"; then
FILTER_DIRNAME="filters"
fi
-AC_DEFINE_UNQUOTED(FILTER_DIRNAME,"$FILTER_DIRNAME",[filter subdirectory.])
-AC_SUBST(FILTER_DIRNAME)
+AC_DEFINE_UNQUOTED([FILTER_DIRNAME],["$FILTER_DIRNAME"],[filter subdirectory.])
+AC_SUBST([FILTER_DIRNAME])
FILTER_RELATIVE_PATH="${FILTER_DIRNAME}"
FILTER_PATH="${MODULES_PATH}/${FILTER_DIRNAME}"
-AC_SUBST(FILTER_PATH)
+AC_SUBST([FILTER_PATH])
#
# Path to ImageMagick documentation files
@@ -3057,8 +3064,8 @@
DEFINE_DOCUMENTATION_PATH=`$WinPathScript "$DEFINE_DOCUMENTATION_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(DOCUMENTATION_PATH,"$DEFINE_DOCUMENTATION_PATH",[Directory where ImageMagick documents live.])
-AC_SUBST(DOCUMENTATION_PATH)
+AC_DEFINE_UNQUOTED([DOCUMENTATION_PATH],["$DEFINE_DOCUMENTATION_PATH"],[Directory where ImageMagick documents live.])
+AC_SUBST([DOCUMENTATION_PATH])
#
# Enable/Disable documentation
@@ -3066,11 +3073,11 @@
[AS_HELP_STRING([--disable-docs],
[disable building of documentation])],
wantdocs=$enableval, wantdocs=yes)
-AM_CONDITIONAL([INSTALL_DOC], [test "$wantdocs" = "yes"])
+AM_CONDITIONAL([INSTALL_DOC],[test "$wantdocs" = "yes"])
# Subdirectory to place architecture-dependent configuration files
CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
-AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",[Subdirectory of lib where architecture-dependent configuration files live.])
+AC_DEFINE_UNQUOTED([CONFIGURE_RELATIVE_PATH],["$CONFIGURE_RELATIVE_PATH"],[Subdirectory of lib where architecture-dependent configuration files live.])
CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
case "${build_os}" in
@@ -3078,12 +3085,12 @@
DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_PATH",[Directory where architecture-dependent configuration files live.])
-AC_SUBST(CONFIGURE_PATH)
+AC_DEFINE_UNQUOTED([CONFIGURE_PATH],["$DEFINE_CONFIGURE_PATH"],[Directory where architecture-dependent configuration files live.])
+AC_SUBST([CONFIGURE_PATH])
# Subdirectory to place architecture-independent configuration files
SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}"
-AC_DEFINE_UNQUOTED(SHARE_RELATIVE_PATH,"$SHARE_RELATIVE_PATH",[Subdirectory of lib where architecture-independent configuration files live.])
+AC_DEFINE_UNQUOTED([SHARE_RELATIVE_PATH],["$SHARE_RELATIVE_PATH"],[Subdirectory of lib where architecture-independent configuration files live.])
SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}"
DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
case "${build_os}" in
@@ -3091,28 +3098,28 @@
DEFINE_SHARE_PATH=`$WinPathScript "$DEFINE_SHARE_PATH" 1`
;;
esac
-AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",[Directory where architecture-independent configuration files live.])
-AC_SUBST(SHARE_PATH)
+AC_DEFINE_UNQUOTED([SHARE_PATH],["$DEFINE_SHARE_PATH"],[Directory where architecture-independent configuration files live.])
+AC_SUBST([SHARE_PATH])
#
# Subdirectory to place architecture-dependent configuration files.
if test "x$SHAREARCH_BASEDIRNAME" = "x"; then
SHAREARCH_BASEDIRNAME="config"
fi
-AC_DEFINE_UNQUOTED(SHAREARCH_BASEDIRNAME,"$SHAREARCH_BASEDIRNAME",[Sharearch directory name without ABI part.])
-AC_SUBST(SHAREARCH_BASEDIRNAME)
+AC_DEFINE_UNQUOTED([SHAREARCH_BASEDIRNAME],["$SHAREARCH_BASEDIRNAME"],[Sharearch directory name without ABI part.])
+AC_SUBST([SHAREARCH_BASEDIRNAME])
if test "x$SHAREARCH_DIRNAME" = "x"; then
SHAREARCH_DIRNAME=${SHAREARCH_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
else
- AC_DEFINE_UNQUOTED(SHAREARCH_DIRNAME,"$SHAREARCH_DIRNAME",[Sharearch directory dirname])
+ AC_DEFINE_UNQUOTED([SHAREARCH_DIRNAME],["$SHAREARCH_DIRNAME"],[Sharearch directory dirname])
fi
-AC_SUBST(SHAREARCH_DIRNAME)
+AC_SUBST([SHAREARCH_DIRNAME])
SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}"
-AC_SUBST(SHAREARCH_RELATIVE_PATH)
+AC_SUBST([SHAREARCH_RELATIVE_PATH])
SHAREARCH_PATH="${LIBRARY_PATH}/${SHAREARCH_RELATIVE_PATH}"
-AC_SUBST(SHAREARCH_PATH)
+AC_SUBST([SHAREARCH_PATH])
#
# program_transform_name is formed for use in a Makefile, so create a
@@ -3168,51 +3175,51 @@
XPSDelegateDefault='gxps'
# Search for delegates
-AC_PATH_PROG(BPGDecodeDelegate, "$BPGDecodeDelegateDefault", "$BPGDecodeDelegateDefault")
-AC_PATH_PROG(BPGEncodeDelegate, "$BPGEncodeDelegateDefault", "$BPGEncodeDelegateDefault")
-AC_PATH_PROG(BlenderDecodeDelegate, "$BlenderDecodeDelegateDefault", "$BlenderDecodeDelegateDefault")
-AC_PATH_PROGS(BrowseDelegate, "$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx, "$BrowseDelegateDefault")
-AC_PATH_PROG(DNGDecodeDelegate, "$DNGDecodeDelegateDefault", "$DNGDecodeDelegateDefault")
-AC_PATH_PROG(DOCDecodeDelegate, "$DOCDecodeDelegateDefault", "$DOCDecodeDelegateDefault")
-AC_PATH_PROG(DVIDecodeDelegate, "$DVIDecodeDelegateDefault", "$DVIDecodeDelegateDefault")
-AC_PATH_PROG(ConvertDelegate, "$ConvertDelegateDefault", "$ConvertDelegateDefault")
-AC_PATH_PROG(DisplayDelegate, "$DisplayDelegateDefault", "$DisplayDelegateDefault")
-AC_PATH_PROG(EditorDelegate, "$EditorDelegateDefault", "$EditorDelegateDefault")
-AC_PATH_PROG(GVCDecodeDelegate, "$GVCDecodeDelegateDefault", "$GVCDecodeDelegateDefault")
-AC_PATH_PROG(HPGLDecodeDelegate, "$HPGLDecodeDelegateDefault", "$HPGLDecodeDelegateDefault")
-AC_PATH_PROG(HTMLDecodeDelegate, "$HTMLDecodeDelegateDefault", "$HTMLDecodeDelegateDefault")
-AC_PATH_PROG(ILBMDecodeDelegate, "$ILBMDecodeDelegateDefault", "$ILBMDecodeDelegateDefault")
-AC_PATH_PROG(ILBMEncodeDelegate, "$ILBMEncodeDelegateDefault", "$ILBMEncodeDelegateDefault")
-AC_PATH_PROG(JXRDecodeDelegate, "$JXRDecodeDelegateDefault", "$JXRDecodeDelegateDefault")
-AC_PATH_PROG(JXREncodeDelegate, "$JXREncodeDelegateDefault", "$JXREncodeDelegateDefault")
-AC_PATH_PROG(LEPDelegate, "$LEPDelegateDefault", "$LEPDelegateDefault")
-AC_PATH_PROG(LPDelegate, "$LPDelegateDefault", no)
-AC_PATH_PROG(LPRDelegate, "$LPRDelegateDefault", "$LPRDelegateDefault")
-AC_PATH_PROG(LaunchDelegate, "$LaunchDelegateDefault", "$LaunchDelegateDefault")
-AC_PATH_PROG(MogrifyDelegate, "$MogrifyDelegateDefault", "$MogrifyDelegateDefault")
-AC_PATH_PROG(MPEGDecodeDelegate, "$MPEGDecodeDelegateDefault", "$MPEGDecodeDelegateDefault")
+AC_PATH_PROG([BPGDecodeDelegate],[ "$BPGDecodeDelegateDefault"],[ "$BPGDecodeDelegateDefault"])
+AC_PATH_PROG([BPGEncodeDelegate],[ "$BPGEncodeDelegateDefault"],[ "$BPGEncodeDelegateDefault"])
+AC_PATH_PROG([BlenderDecodeDelegate],[ "$BlenderDecodeDelegateDefault"],[ "$BlenderDecodeDelegateDefault"])
+AC_PATH_PROGS([BrowseDelegate],["$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx],["$BrowseDelegateDefault"])
+AC_PATH_PROG([DNGDecodeDelegate],[ "$DNGDecodeDelegateDefault"],[ "$DNGDecodeDelegateDefault"])
+AC_PATH_PROG([DOCDecodeDelegate],[ "$DOCDecodeDelegateDefault"],[ "$DOCDecodeDelegateDefault"])
+AC_PATH_PROG([DVIDecodeDelegate],[ "$DVIDecodeDelegateDefault"],[ "$DVIDecodeDelegateDefault"])
+AC_PATH_PROG([ConvertDelegate],[ "$ConvertDelegateDefault"],[ "$ConvertDelegateDefault"])
+AC_PATH_PROG([DisplayDelegate],[ "$DisplayDelegateDefault"],[ "$DisplayDelegateDefault"])
+AC_PATH_PROG([EditorDelegate],[ "$EditorDelegateDefault"],[ "$EditorDelegateDefault"])
+AC_PATH_PROG([GVCDecodeDelegate],[ "$GVCDecodeDelegateDefault"],[ "$GVCDecodeDelegateDefault"])
+AC_PATH_PROG([HPGLDecodeDelegate],[ "$HPGLDecodeDelegateDefault"],[ "$HPGLDecodeDelegateDefault"])
+AC_PATH_PROG([HTMLDecodeDelegate],[ "$HTMLDecodeDelegateDefault"],[ "$HTMLDecodeDelegateDefault"])
+AC_PATH_PROG([ILBMDecodeDelegate],[ "$ILBMDecodeDelegateDefault"],[ "$ILBMDecodeDelegateDefault"])
+AC_PATH_PROG([ILBMEncodeDelegate],[ "$ILBMEncodeDelegateDefault"],[ "$ILBMEncodeDelegateDefault"])
+AC_PATH_PROG([JXRDecodeDelegate],[ "$JXRDecodeDelegateDefault"],[ "$JXRDecodeDelegateDefault"])
+AC_PATH_PROG([JXREncodeDelegate],[ "$JXREncodeDelegateDefault"],[ "$JXREncodeDelegateDefault"])
+AC_PATH_PROG([LEPDelegate],[ "$LEPDelegateDefault"],[ "$LEPDelegateDefault"])
+AC_PATH_PROG([LPDelegate],[ "$LPDelegateDefault"],[ no])
+AC_PATH_PROG([LPRDelegate],[ "$LPRDelegateDefault"],[ "$LPRDelegateDefault"])
+AC_PATH_PROG([LaunchDelegate],[ "$LaunchDelegateDefault"],[ "$LaunchDelegateDefault"])
+AC_PATH_PROG([MogrifyDelegate],[ "$MogrifyDelegateDefault"],[ "$MogrifyDelegateDefault"])
+AC_PATH_PROG([MPEGDecodeDelegate],[ "$MPEGDecodeDelegateDefault"],[ "$MPEGDecodeDelegateDefault"])
if test "$MPEGDecodeDelegate" = "$MPEGDecodeDelegateDefault" ; then
MPEGDecodeDelegateDefault='ffmpeg'
- AC_PATH_PROG(MPEGDecodeDelegate, "$MPEGDecodeDelegateDefault", "$MPEGDecodeDelegateDefault")
+ AC_PATH_PROG([MPEGDecodeDelegate],[ "$MPEGDecodeDelegateDefault"],[ "$MPEGDecodeDelegateDefault"])
fi;
-AC_PATH_PROG(MPEGEncodeDelegate, "$MPEGEncodeDelegateDefault", "$MPEGEncodeDelegateDefault")
+AC_PATH_PROG([MPEGEncodeDelegate],[ "$MPEGEncodeDelegateDefault"],[ "$MPEGEncodeDelegateDefault"])
if test "$MPEGEncodeDelegate" = "$MPEGEncodeDelegateDefault" ; then
MPEGEncodeDelegateDefault='ffmpeg'
- AC_PATH_PROG(MPEGEncodeDelegate, "$MPEGEncodeDelegateDefault", "$MPEGEncodeDelegateDefault")
+ AC_PATH_PROG([MPEGEncodeDelegate],[ "$MPEGEncodeDelegateDefault"],[ "$MPEGEncodeDelegateDefault"])
fi;
-AC_PATH_PROG(MrSIDDecodeDelegate, "$MrSIDDecodeDelegateDefault", "$MrSIDDecodeDelegateDefault")
-AC_PATH_PROG(MVDelegate, "$MVDelegateDefault", "$MVDelegateDefault")
-AC_PATH_PROG(PCLDelegate, "$PCLDelegateDefault", "$PCLDelegateDefault")
-AC_PATH_PROGS(PSDelegate, gsx gsc "$PSDelegateDefault", "$PSDelegateDefault")
-AC_PATH_PROG(RMDelegate, "$RMDelegateDefault", "$RMDelegateDefault")
-AC_PATH_PROG(RSVGDecodeDelegate, "$RSVGDecodeDelegateDefault", "$RSVGDecodeDelegateDefault")
-AC_PATH_PROG(SVGDecodeDelegate, "$SVGDecodeDelegateDefault", "$SVGDecodeDelegateDefault")
-AC_PATH_PROG(TraceEncodeDelegate, "$TraceEncodeDelegateDefault", "$TraceEncodeDelegateDefault")
-AC_PATH_PROG(Fig2devDelegate, "$Fig2devDelegateDefault", "$Fig2devDelegateDefault")
-AC_PATH_PROG(WebPDecodeDelegate, "$WebPDecodeDelegateDefault", "$WebPDecodeDelegateDefault")
-AC_PATH_PROG(WebPEncodeDelegate, "$WebPEncodeDelegateDefault", "$WebPEncodeDelegateDefault")
-AC_PATH_PROG(WWWDecodeDelegate, "$WWWDecodeDelegateDefault", "$WWWDecodeDelegateDelegateDefault")
-AC_PATH_PROG(XPSDelegate, "$XPSDelegateDefault", "$XPSDelegateDefault")
+AC_PATH_PROG([MrSIDDecodeDelegate],[ "$MrSIDDecodeDelegateDefault"],[ "$MrSIDDecodeDelegateDefault"])
+AC_PATH_PROG([MVDelegate],[ "$MVDelegateDefault"],[ "$MVDelegateDefault"])
+AC_PATH_PROG([PCLDelegate],[ "$PCLDelegateDefault"],[ "$PCLDelegateDefault"])
+AC_PATH_PROGS([PSDelegate],[gsx gsc "$PSDelegateDefault"],["$PSDelegateDefault"])
+AC_PATH_PROG([RMDelegate],[ "$RMDelegateDefault"],[ "$RMDelegateDefault"])
+AC_PATH_PROG([RSVGDecodeDelegate],[ "$RSVGDecodeDelegateDefault"],[ "$RSVGDecodeDelegateDefault"])
+AC_PATH_PROG([SVGDecodeDelegate],[ "$SVGDecodeDelegateDefault"],[ "$SVGDecodeDelegateDefault"])
+AC_PATH_PROG([TraceEncodeDelegate],[ "$TraceEncodeDelegateDefault"],[ "$TraceEncodeDelegateDefault"])
+AC_PATH_PROG([Fig2devDelegate],[ "$Fig2devDelegateDefault"],[ "$Fig2devDelegateDefault"])
+AC_PATH_PROG([WebPDecodeDelegate],[ "$WebPDecodeDelegateDefault"],[ "$WebPDecodeDelegateDefault"])
+AC_PATH_PROG([WebPEncodeDelegate],[ "$WebPEncodeDelegateDefault"],[ "$WebPEncodeDelegateDefault"])
+AC_PATH_PROG([WWWDecodeDelegate],[ "$WWWDecodeDelegateDefault"],[ "$WWWDecodeDelegateDelegateDefault"])
+AC_PATH_PROG([XPSDelegate],[ "$XPSDelegateDefault"],[ "$XPSDelegateDefault"])
# Prefer lpr to lp; lp needs options tacked on.
if test "$LPRDelegate" != no; then
@@ -3220,7 +3227,7 @@
else
PrintDelegate="$LPDelegate -c -s"
fi
-AC_SUBST(PrintDelegate)
+AC_SUBST([PrintDelegate])
# Installed ImageMagick utiltity paths
ConvertDelegate="${BIN_DIR}/${ConvertDelegateDefault}"
@@ -3243,7 +3250,7 @@
type_include_files=''
# Apple fonts.
-AC_MSG_CHECKING(for Apple fonts directory)
+AC_MSG_CHECKING([for Apple fonts directory])
apple_font_dir=''
if test "${with_apple_font_dir}" != 'default'; then
apple_font_dir="${with_apple_font_dir}/"
@@ -3261,10 +3268,10 @@
else
AC_MSG_RESULT([not found!]);
fi
-AC_SUBST(apple_font_dir)
+AC_SUBST([apple_font_dir])
# Dejavu fonts.
-AC_MSG_CHECKING(for Dejavu fonts directory)
+AC_MSG_CHECKING([for Dejavu fonts directory])
dejavu_font_dir=''
if test "${with_dejavu_font_dir}" != 'default'; then
dejavu_font_dir="${with_dejavu_font_dir}/"
@@ -3282,10 +3289,10 @@
else
AC_MSG_RESULT([not found!]);
fi
-AC_SUBST(dejavu_font_dir)
+AC_SUBST([dejavu_font_dir])
# Ghostscript
-AC_MSG_CHECKING(for Ghostscript fonts directory)
+AC_MSG_CHECKING([for Ghostscript fonts directory])
ghostscript_font_dir=''
if test "${with_gs_font_dir}" != 'default'; then
ghostscript_font_dir="${with_gs_font_dir}/"
@@ -3322,7 +3329,7 @@
else
AC_MSG_RESULT([not found!]);
fi
-AC_SUBST(ghostscript_font_dir)
+AC_SUBST([ghostscript_font_dir])
case "${build_os}" in
mingw* )
PSDelegate=`$WinPathScript "$PSDelegate" 1`
@@ -3330,7 +3337,7 @@
esac
# URW-base35 fonts.
-AC_MSG_CHECKING(for URW-base35 fonts directory)
+AC_MSG_CHECKING([for URW-base35 fonts directory])
urw_base35_font_dir=''
if test "${with_urw_base35_font_dir}" != 'default'; then
urw_base35_font_dir="${with_urw_base35_font_dir}/"
@@ -3348,10 +3355,10 @@
else
AC_MSG_RESULT([not found!]);
fi
-AC_SUBST(urw_base35_font_dir)
+AC_SUBST([urw_base35_font_dir])
# Windows fonts.
-AC_MSG_CHECKING(for Windows fonts directory)
+AC_MSG_CHECKING([for Windows fonts directory])
windows_font_dir=''
if test "${with_windows_font_dir}" != 'default'; then
windows_font_dir="${with_windows_font_dir}/"
@@ -3369,9 +3376,9 @@
else
AC_MSG_RESULT([not found!]);
fi
-AC_SUBST(windows_font_dir)
+AC_SUBST([windows_font_dir])
-AC_SUBST(type_include_files)
+AC_SUBST([type_include_files])
#
# Handle case where user doesn't want frozen paths
@@ -3416,66 +3423,66 @@
fi
# Delegate substitutions
-AC_SUBST(BPGDecodeDelegate)
-AC_SUBST(BPGEncodeDelegate)
-AC_SUBST(BlenderDecodeDelegate)
-AC_SUBST(BrowseDelegate)
-AC_SUBST(ConvertDelegate)
-AC_SUBST(GVCDecodeDelegate)
-AC_SUBST(DVIDecodeDelegate)
-AC_SUBST(EditorDelegate)
-AC_SUBST(Fig2devDelegate)
-AC_SUBST(HPGLDecodeDelegate)
-AC_SUBST(HTMLDecodeDelegate)
-AC_SUBST(ILBMDecodeDelegate)
-AC_SUBST(ILBMEncodeDelegate)
-AC_SUBST(JXRDecodeDelegate)
-AC_SUBST(JXREncodeDelegate)
-AC_SUBST(LaunchDelegate)
-AC_SUBST(LEPDelegate)
-AC_SUBST(LPDelegate)
-AC_SUBST(MPEGDecodeDelegate)
-AC_SUBST(MPEGEncodeDelegate)
-AC_SUBST(MogrifyDelegate)
-AC_SUBST(MrSIDDecodeDelegate)
-AC_SUBST(PCLDelegate)
-AC_SUBST(PSDelegate)
-AC_SUBST(ShowImageDelegate)
-AC_SUBST(TraceEncodeDelegate)
-AC_SUBST(WebPDecodeDelegate)
-AC_SUBST(WebPEncodeDelegate)
-AC_SUBST(WWWDecodeDelegate)
-AC_SUBST(XPSDelegate)
+AC_SUBST([BPGDecodeDelegate])
+AC_SUBST([BPGEncodeDelegate])
+AC_SUBST([BlenderDecodeDelegate])
+AC_SUBST([BrowseDelegate])
+AC_SUBST([ConvertDelegate])
+AC_SUBST([GVCDecodeDelegate])
+AC_SUBST([DVIDecodeDelegate])
+AC_SUBST([EditorDelegate])
+AC_SUBST([Fig2devDelegate])
+AC_SUBST([HPGLDecodeDelegate])
+AC_SUBST([HTMLDecodeDelegate])
+AC_SUBST([ILBMDecodeDelegate])
+AC_SUBST([ILBMEncodeDelegate])
+AC_SUBST([JXRDecodeDelegate])
+AC_SUBST([JXREncodeDelegate])
+AC_SUBST([LaunchDelegate])
+AC_SUBST([LEPDelegate])
+AC_SUBST([LPDelegate])
+AC_SUBST([MPEGDecodeDelegate])
+AC_SUBST([MPEGEncodeDelegate])
+AC_SUBST([MogrifyDelegate])
+AC_SUBST([MrSIDDecodeDelegate])
+AC_SUBST([PCLDelegate])
+AC_SUBST([PSDelegate])
+AC_SUBST([ShowImageDelegate])
+AC_SUBST([TraceEncodeDelegate])
+AC_SUBST([WebPDecodeDelegate])
+AC_SUBST([WebPEncodeDelegate])
+AC_SUBST([WWWDecodeDelegate])
+AC_SUBST([XPSDelegate])
#
# RPM support.
#
RPM=''
-AC_CHECK_PROGS(TAR,gnutar gtar tar)
-AC_CHECK_PROGS(PERL,perl)
-AC_CHECK_PROGS(RPM,rpmbuild rpm)
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AC_SUBST(RPM)
-AM_CONDITIONAL(RPM_DELEGATE, test "x$RPM" != "x" )
+AC_CHECK_PROGS([TAR],[gnutar gtar tar])
+AC_CHECK_PROGS([PERL],[perl])
+AC_CHECK_PROGS([RPM],[rpmbuild rpm])
+AM_MISSING_PROG([ACLOCAL],[aclocal],[$missing_dir])
+AM_MISSING_PROG([AUTOCONF],[autoconf],[$missing_dir])
+AM_MISSING_PROG([AUTOMAKE],[automake],[$missing_dir])
+AM_MISSING_PROG([AUTOHEADER],[autoheader],[$missing_dir])
+AC_SUBST([RPM])
+AM_CONDITIONAL([RPM_DELEGATE],[ test "x$RPM" != "x" ])
#
# 7ZIP support (http://p7zip.sourceforge.net/)
#
P7ZIP=''
-AC_CHECK_PROGS(P7ZIP,[7za])
-AC_SUBST(P7ZIP)
-AM_CONDITIONAL(P7ZIP_DELEGATE, test "x$P7ZIP" != "x" )
+AC_CHECK_PROGS([P7ZIP],[7za])
+AC_SUBST([P7ZIP])
+AM_CONDITIONAL([P7ZIP_DELEGATE],[ test "x$P7ZIP" != "x" ])
#
# ZIP support (http://www.info-zip.org/Zip.html)
#
ZIP=''
-AC_CHECK_PROGS(ZIP,[zip])
-AC_SUBST(ZIP)
-AM_CONDITIONAL(ZIP_DELEGATE, test "x$ZIP" != "x" )
+AC_CHECK_PROGS([ZIP],[zip])
+AC_SUBST([ZIP])
+AM_CONDITIONAL([ZIP_DELEGATE],[ test "x$ZIP" != "x" ])
#
# GhostPCL related configuration.
@@ -3518,10 +3525,10 @@
AC_MSG_RESULT([$PCLMonoDevice])
fi
-AC_SUBST(PCLMonoDevice)
-AC_SUBST(PCLColorDevice)
-AC_SUBST(PCLCMYKDevice)
-AC_SUBST(PCLVersion)
+AC_SUBST([PCLMonoDevice])
+AC_SUBST([PCLColorDevice])
+AC_SUBST([PCLCMYKDevice])
+AC_SUBST([PCLVersion])
#
# GhostXPS related configuration.
@@ -3564,10 +3571,10 @@
AC_MSG_RESULT([$XPSMonoDevice])
fi
-AC_SUBST(XPSMonoDevice)
-AC_SUBST(XPSColorDevice)
-AC_SUBST(XPSCMYKDevice)
-AC_SUBST(XPSVersion)
+AC_SUBST([XPSMonoDevice])
+AC_SUBST([XPSColorDevice])
+AC_SUBST([XPSCMYKDevice])
+AC_SUBST([XPSVersion])
#
# Ghostscript related configuration.
@@ -3656,14 +3663,14 @@
AC_MSG_RESULT([$GSEPSDevice])
fi
-AC_SUBST(GSAlphaDevice)
-AC_SUBST(GSCMYKDevice)
-AC_SUBST(GSColorDevice)
-AC_SUBST(GSEPSDevice)
-AC_SUBST(GSMonoDevice)
-AC_SUBST(GSPDFDevice)
-AC_SUBST(GSPSDevice)
-AC_SUBST(GSVersion)
+AC_SUBST([GSAlphaDevice])
+AC_SUBST([GSCMYKDevice])
+AC_SUBST([GSColorDevice])
+AC_SUBST([GSEPSDevice])
+AC_SUBST([GSMonoDevice])
+AC_SUBST([GSPDFDevice])
+AC_SUBST([GSPSDevice])
+AC_SUBST([GSVersion])
#
# PerlMagick-related configuration
@@ -3677,12 +3684,12 @@
AC_MSG_CHECKING([for Perl])
AC_MSG_RESULT([])
if test "$with_perl" != 'yes'; then
- AC_CACHE_CHECK(for perl,ac_cv_path_PERL,ac_cv_path_PERL="$with_perl");
+ AC_CACHE_CHECK([for perl],[ac_cv_path_PERL],[ac_cv_path_PERL="$with_perl"]);
PERL=$ac_cv_path_PERL
- AC_SUBST(PERL)dnl
+ AC_SUBST([PERL])dnl
have_perl="$ac_cv_path_PERL"
else
- AC_PATH_PROGS(PERL,perl perl5,)dnl
+ AC_PATH_PROGS([PERL],[perl perl5],[])dnl
if test "$ac_cv_path_PERL"; then
have_perl="$ac_cv_path_PERL"
fi
@@ -3707,10 +3714,10 @@
# Is PERL's MakeMaker new enough to support DESTDIR?
AX_PROG_PERL_VERSION(5.8.1,[PERL_SUPPORTS_DESTDIR='yes'],[PERL_SUPPORTS_DESTDIR='no'])
fi
-AM_CONDITIONAL(WITH_PERL, test "$have_perl" != 'no')
-AM_CONDITIONAL(WITH_PERL_STATIC, test $with_perl_static = 'yes')
-AM_CONDITIONAL(WITH_PERL_DYNAMIC, test $with_perl_dynamic = 'yes')
-AC_SUBST(PERL_SUPPORTS_DESTDIR)
+AM_CONDITIONAL([WITH_PERL],[ test "$have_perl" != 'no'])
+AM_CONDITIONAL([WITH_PERL_STATIC],[ test $with_perl_static = 'yes'])
+AM_CONDITIONAL([WITH_PERL_DYNAMIC],[ test $with_perl_dynamic = 'yes'])
+AC_SUBST([PERL_SUPPORTS_DESTDIR])
# Determine path to pick up MagickCore library from for use with building PerlMagick
MAGICKCORE_PATH="${LIB_DIR}"
@@ -3721,7 +3728,7 @@
# Linker search path to library, followed by -lMagickCore
MAGICKCORE_PATH="${builddir}/MagickCore/${libtool_objdir}"
fi
-AC_SUBST(MAGICKCORE_PATH)
+AC_SUBST([MAGICKCORE_PATH])
# Create a simple string containing format names for all delegate libraries.
MAGICK_DELEGATES=''
@@ -3846,8 +3853,8 @@
# Remove extraneous spaces from output variables (asthetic)
MAGICK_DELEGATES=`echo $MAGICK_DELEGATES | sed -e 's/ */ /g'`
MAGICK_FEATURES=`echo $MAGICK_FEATURES | sed -e 's/ */ /g'`
-AC_SUBST(MAGICK_DELEGATES)
-AC_SUBST(MAGICK_FEATURES)
+AC_SUBST([MAGICK_DELEGATES])
+AC_SUBST([MAGICK_FEATURES])
#
# Handle special compiler flags
@@ -3870,8 +3877,8 @@
# Add '-ftest-coverage -fprofile-arcs' if gcov source profiling support enabled
# This is a gcc-specific feature
if test "$enable_gcov" = 'yes'; then
- AC_CHECK_LIB(gcov,_gcov_init)
- AC_CHECK_LIB(gcov,__gcov_init)
+ AC_CHECK_LIB([gcov],[_gcov_init],[],[])
+ AC_CHECK_LIB([gcov],[__gcov_init],[],[])
case "$target_os" in
darwin*)
OSX_GCOV_LDFLAG="-Wl,-single_module"
@@ -3880,7 +3887,7 @@
OSX_GCOV_LDFLAG=""
;;
esac
- AC_SUBST(OSX_GCOV_LDFLAG)
+ AC_SUBST([OSX_GCOV_LDFLAG])
CFLAGS="-ftest-coverage -fprofile-arcs $CFLAGS"
CXXFLAGS="-ftest-coverage -fprofile-arcs $CXXFLAGS"
LDFLAGS="-ftest-coverage -fprofile-arcs $LDFLAGS"
@@ -3896,18 +3903,18 @@
MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $JXL_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $HEIF_LIBS $WEBPMUX_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS"
fi
MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS"
-AC_SUBST(MAGICK_DEP_LIBS)
-AC_SUBST(MAGICK_EXTRA_DEP_LIBS)
+AC_SUBST([MAGICK_DEP_LIBS])
+AC_SUBST([MAGICK_EXTRA_DEP_LIBS])
# Pass only user-provided LIBS as "global" libraries
LIBS=$USER_LIBS
-#AC_SUBST(CPPFLAGS)
-AC_SUBST(X_CFLAGS)
-#AC_SUBST(LDFLAGS)
-#AC_SUBST(X_PRE_LIBS)
-#AC_SUBST(X_LIBS)
-#AC_SUBST(X_EXTRA_LIBS)
+#AC_SUBST([CPPFLAGS])
+AC_SUBST([X_CFLAGS])
+#AC_SUBST([LDFLAGS])
+#AC_SUBST([X_PRE_LIBS])
+#AC_SUBST([X_LIBS])
+#AC_SUBST([X_EXTRA_LIBS])
MAGICK_CFLAGS=$CFLAGS
MAGICK_CXXFLAGS="$CXXFLAGS"
@@ -3916,12 +3923,12 @@
MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
MAGICK_LIBS="$MAGICK_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS"
-AC_SUBST(MAGICK_CFLAGS)
-AC_SUBST(MAGICK_CXXFLAGS)
-AC_SUBST(MAGICK_CPPFLAGS)
-AC_SUBST(MAGICK_PCFLAGS)
-AC_SUBST(MAGICK_LDFLAGS)
-AC_SUBST(MAGICK_LIBS)
+AC_SUBST([MAGICK_CFLAGS])
+AC_SUBST([MAGICK_CXXFLAGS])
+AC_SUBST([MAGICK_CPPFLAGS])
+AC_SUBST([MAGICK_PCFLAGS])
+AC_SUBST([MAGICK_LDFLAGS])
+AC_SUBST([MAGICK_LIBS])
# Set configured scripts to executable.
AC_CONFIG_COMMANDS([default],[],[])