-# Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization
+# Copyright 1999-2017 ImageMagick Studio LLC, a non-profit organization
# dedicated to making software imaging solutions freely available.
#
# You may not use this file except in compliance with the License. You may
# obtain a copy of the License at
#
-# http://www.imagemagick.org/script/license.php
+# https://www.imagemagick.org/script/license.php
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# ==============================================================================
m4_define([magick_major_version], [7])
m4_define([magick_minor_version], [0])
-m4_define([magick_micro_version], [1])
+m4_define([magick_micro_version], [6])
m4_define([magick_patchlevel_version], [0])
m4_define([magick_version],
[magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])
[magick_version],
[https://github.com/ImageMagick/ImageMagick/issues],
[magick_tar_name],
- [http://www.imagemagick.org])
+ [https://www.imagemagick.org])
AC_CONFIG_SRCDIR([MagickCore/MagickCore.h])
AC_CONFIG_AUX_DIR([config])
AC_REQUIRE_AUX_FILE([tap-driver.sh])
mingw* )
native_win32_build='yes'
GDI32_LIBS='-lgdi32'
+ OLE_LIBS='-loleaut32'
;;
esac
if test "${GDI32_LIBS}x" != 'x'; then
AC_DEFINE(WINGDI32_DELEGATE,1,Define to use the Windows GDI32 library)
fi
AC_SUBST(GDI32_LIBS)
+AC_SUBST(OLE_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' )
CFLAGS="$CFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
CPPFLAGS="$CPPFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
+# Enable pipes (|) in filenames.
+AC_ARG_ENABLE([pipes],
+ [AC_HELP_STRING([--enable-pipes],
+ [enable pipes (|) in filenames])],
+ [enable_pipes=$enableval],
+ [enable_pipes='no'])
+
+if test "$enable_pipes" = 'yes'; then
+ AC_DEFINE(PIPES_SUPPORT,1,[enable pipes (|) in filenames])
+ MAGICK_FEATURES="Pipes $MAGICK_FEATURES"
+fi
+
# Build a version of ImageMagick with assert statements.
AC_ARG_ENABLE([assert],
[AC_HELP_STRING([--disable-assert],
# Enable legacy support (default no)
AC_ARG_ENABLE(legacy-support,
- [ --enable-legacy-support install legacy command-line utilities (default disabled)],
+ [ --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')
MAGICK_FEATURES="DPC $MAGICK_FEATURES"
])
-AC_CHECK_FUNCS([acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock ctime_r directio _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink readdir_r realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat])
+AC_CHECK_FUNCS([acosh _aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat])
#
# Check for clock_gettime().
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",,)
+ fi
+ fi
# GCC
if test "x$GOMP_LIBS" = x ; then
AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,)
AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for ImageMagick delegate programs])
AC_MSG_RESULT([])
-AutotraceDecodeDelegateDefault='autotrace'
BPGDecodeDelegateDefault='bpgdec'
BPGEncodeDelegateDefault='bpgenc'
BlenderDecodeDelegateDefault='blender'
-BZIPDelegateDefault='bzip2'
BrowseDelegateDefault='xdg-open'
-CatDelegateDefault='cat'
DNGDecodeDelegateDefault='ufraw-batch'
DOCDecodeDelegateDefault='soffice'
GVCDecodeDelegateDefault='dot'
DVIDecodeDelegateDefault='dvips'
-EchoDelegateDefault='echo'
EditorDelegateDefault='xterm'
-ConvertDelegateDefault=`echo convert | sed ${configure_transform_name}`
-DisplayDelegateDefault=`echo display | sed ${configure_transform_name}`
-MogrifyDelegateDefault=`echo mogrify | sed ${configure_transform_name}`
-GnuplotDecodeDelegateDefault='gnuplot'
+ConvertDelegateDefault=`echo magick | sed ${configure_transform_name}`
+DisplayDelegateDefault=`echo magick | sed ${configure_transform_name}`
+MogrifyDelegateDefault=`echo magick | sed ${configure_transform_name}`
HPGLDecodeDelegateDefault='hp2xx'
HTMLDecodeDelegateDefault='html2ps'
ILBMDecodeDelegateDefault='ilbmtoppm'
ILBMEncodeDelegateDefault='ppmtoilbm'
JXRDecodeDelegateDefault='JxrDecApp'
JXREncodeDelegateDefault='JxrEncApp'
+LEPDelegateDefault='lepton'
LPDelegateDefault='lp'
LPRDelegateDefault='lpr'
LaunchDelegateDefault='gimp'
-MANDelegateDefault='groff'
MPEGDecodeDelegateDefault='avconv'
MPEGEncodeDelegateDefault='avconv'
MrSIDDecodeDelegateDefault='mrsidgeodecode'
MVDelegateDefault='mv'
PCLDelegateDefault='pcl6'
-PGPDecodeDelegateDefault='pgpv'
-POVDelegateDefault='povray'
if test "$native_win32_build" = 'yes'; then
PSDelegateDefault='gswin32c'
elif test "$gslib_framework" = 'yes'; then
else
PSDelegateDefault='gs'
fi
-RLEEncodeDelegateDefault='rawtorle'
RMDelegateDefault='rm'
RSVGDecodeDelegateDefault='rsvg-convert'
-SCANDecodeDelegateDefault='scanimage'
SVGDecodeDelegateDefault='inkscape'
-TXTDelegateDefault='enscript'
UniconvertorDelegateDefault='uniconvertor'
WebPDecodeDelegateDefault='dwebp'
WebPEncodeDelegateDefault='cwebp'
-WMFDecodeDelegateDefault='wmf2eps'
WWWDecodeDelegateDefault='curl'
XPSDelegateDefault='gxps'
-ZipDelegateDefault='gzip'
# Search for delegates
-AC_PATH_PROG(AutotraceDecodeDelegate, "$AutotraceDecodeDelegateDefault", "$AutotraceDecodeDelegateDefault")
AC_PATH_PROG(BPGDecodeDelegate, "$BPGDecodeDelegateDefault", "$BPGDecodeDelegateDefault")
AC_PATH_PROG(BPGEncodeDelegate, "$BPGEncodeDelegateDefault", "$BPGEncodeDelegateDefault")
AC_PATH_PROG(BlenderDecodeDelegate, "$BlenderDecodeDelegateDefault", "$BlenderDecodeDelegateDefault")
-AC_PATH_PROG(BZIPDelegate, "$BZIPDelegateDefault", "$BZIPDelegateDefault")
AC_PATH_PROGS(BrowseDelegate, "$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx, "$BrowseDelegateDefault")
-AC_PATH_PROG(CatDelegate, "$CatDelegateDefault", "$CatDelegateDefault")
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(EchoDelegate, "$EchoDelegateDefault", "$EchoDelegateDefault")
AC_PATH_PROG(EditorDelegate, "$EditorDelegateDefault", "$EditorDelegateDefault")
-AC_PATH_PROG(GnuplotDecodeDelegate, "$GnuplotDecodeDelegateDefault", "$GnuplotDecodeDelegateDefault")
AC_PATH_PROG(GVCDecodeDelegate, "$GVCDecodeDelegateDefault", "$GVCDecodeDelegateDefault")
AC_PATH_PROG(HPGLDecodeDelegate, "$HPGLDecodeDelegateDefault", "$HPGLDecodeDelegateDefault")
AC_PATH_PROG(HTMLDecodeDelegate, "$HTMLDecodeDelegateDefault", "$HTMLDecodeDelegateDefault")
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(MANDelegate, "$MANDelegateDefault", "$MANDelegateDefault")
AC_PATH_PROG(MogrifyDelegate, "$MogrifyDelegateDefault", "$MogrifyDelegateDefault")
AC_PATH_PROG(MPEGDecodeDelegate, "$MPEGDecodeDelegateDefault", "$MPEGDecodeDelegateDefault")
if test "$MPEGDecodeDelegate" = "$MPEGDecodeDelegateDefault" ; then
AC_PATH_PROG(MrSIDDecodeDelegate, "$MrSIDDecodeDelegateDefault", "$MrSIDDecodeDelegateDefault")
AC_PATH_PROG(MVDelegate, "$MVDelegateDefault", "$MVDelegateDefault")
AC_PATH_PROG(PCLDelegate, "$PCLDelegateDefault", "$PCLDelegateDefault")
-AC_PATH_PROG(PGPDecodeDelegate, "$PGPDecodeDelegateDefault", "$PGPDecodeDelegateDefault")
-AC_PATH_PROG(POVDelegate, "$POVDelegateDefault", "$POVDelegateDefault")
AC_PATH_PROGS(PSDelegate, gsx gsc "$PSDelegateDefault", "$PSDelegateDefault")
-AC_PATH_PROG(RLEEncodeDelegate, "$RLEEncodeDelegateDefault", "$RLEEncodeDelegateDefault")
AC_PATH_PROG(RMDelegate, "$RMDelegateDefault", "$RMDelegateDefault")
AC_PATH_PROG(RSVGDecodeDelegate, "$RSVGDecodeDelegateDefault", "$RSVGDecodeDelegateDefault")
-AC_PATH_PROG(SCANDecodeDelegate, "$SCANDecodeDelegateDefault", "$SCANDecodeDelegateDefault")
AC_PATH_PROG(SVGDecodeDelegate, "$SVGDecodeDelegateDefault", "$SVGDecodeDelegateDefault")
-AC_PATH_PROG(TXTDelegate, "$TXTDelegateDefault", "$TXTDelegateDefault")
AC_PATH_PROG(UniconvertorDelegate, "$UniconvertorDelegateDefault", "$UniconvertorDelegateDefault")
AC_PATH_PROG(WebPDecodeDelegate, "$WebPDecodeDelegateDefault", "$WebPDecodeDelegateDefault")
AC_PATH_PROG(WebPEncodeDelegate, "$WebPEncodeDelegateDefault", "$WebPEncodeDelegateDefault")
-AC_PATH_PROG(WMFDecodeDelegate, "$WMFDecodeDelegateDefault", "$WMFDecodeDelegateDefault")
-AC_PATH_PROG(WWWDecodeDelegate, "$WWWDecodeDelegateDefault", "$WWWDecodeDelegateDefault")
+AC_PATH_PROG(WWWDecodeDelegate, "$WWWDecodeDelegateDefault", "$WWWDecodeDelegateDelegateDefault")
AC_PATH_PROG(XPSDelegate, "$XPSDelegateDefault", "$XPSDelegateDefault")
-AC_PATH_PROG(ZipDelegate, "$ZipDelegateDefault", "$ZipDelegateDefault")
# Prefer lpr to lp; lp needs options tacked on.
if test "$LPRDelegate" != no; then
#
type_include_files=''
- Apple fonts.
+# Apple fonts.
AC_MSG_CHECKING(for Apple fonts directory)
apple_font_dir=''
if test "${with_apple_font_dir}" != 'default'; then
#
if test "$with_frozenpaths" != 'yes'; then
# Re-set delegate definitions to default (no paths)
- AutotraceDecodeDelegate="$AutotraceDecodeDelegateDefault"
BPGDecodeDelegate="$BPGDecodeDelegateDefault"
BPGEncodeDelegate="$BPGEncodeDelegateDefault"
BlenderDecodeDelegate="$BlenderDecodeDelegateDefault"
- BZIPDelegate="$BZIPDelegateDefault"
BrowseDelegate="$BrowseDelegateDefault"
- CatDelegate="$CatDelegateDefault"
ConvertDelegate="$ConvertDelegateDefault"
DisplayDelegate="$DisplayDelegateDefault"
DNGDecodeDelegate="$DNGDecodeDelegateDefault"
DOCDecodeDelegate="$DOCDecodeDelegateDefault"
DVIDecodeDelegate="$DVIDecodeDelegateDefault"
- EchoDelegate="$EchoDelegateDefault"
EditorDelegate="$EditorDelegateDefault"
- GnuplotDecodeDelegate="$GnuplotDecodeDelegateDefault"
GVCDecodeDelegate="$GVCDecodeDelegateDefault"
HPGLDecodeDelegate="$HPGLDecodeDelegateDefault"
HTMLDecodeDelegate="$HTMLDecodeDelegateDefault"
ILBMEncodeDelegate="$ILBMEncodeDelegateDefault"
JXRDecodeDelegate="$JXRDecodeDelegateDefault"
JXREncodeDelegate="$JXREncodeDelegateDefault"
+ LEPDelegate="$LEPDelegateDefault"
LPDelegate="$LPDelegateDefault"
LaunchDelegate="$LaunchDelegateDefault"
- MANDelegate="$MANDelegateDefault"
MPEGDecodeDelegate="$MPEGDecodeDelegateDefault"
MPEGEncodeDelegate="$MPEGEncodeDelegateDefault"
MogrifyDelegate="$MogrifyDelegateDefault"
MrSIDDecodeDelegate="$MrSIDDecodeDelegateDefault"
- MVDelegate="$MVDelegateDefault"
PCLDelegate="$PCLDelegateDefault"
- PGPDecodeDelegate="$PGPDecodeDelegateDefault"
- POVDelegate="$POVDelegateDefault"
PSDelegate="$PSDelegateDefault"
- RLEEncodeDelegate="$RLEEncodeDelegateDefault"
- RMDelegate="$RMDelegateDefault"
RSVGDecodeDelegate="$RSVGDecodeDelegateDefault"
- SCANDecodeDelegate="$SCANDecodeDelegateDefault"
SVGDecodeDelegate="$SVGDecodeDelegateDefault"
ShowImageDelegate="$ShowImageDelegateDefault"
- TXTDelegate="$TXTDelegateDefault"
UniconvertorDelegate="$UniconvertorDelegateDefault"
WebPDecodeDelegate="$WebPDecodeDelegateDefault"
WebPEncodeDelegate="$WebPEncodeDelegateDefault"
- WMFDecodeDelegate="$WMFDecodeDelegateDefault"
WWWDecodeDelegate="$WWWDecodeDelegateDefault"
XPSDelegate="$XPSDelegateDefault"
- ZipDelegate="$ZipDelegateDefault"
fi
# Delegate substitutions
-AC_SUBST(AutotraceDecodeDelegate)
AC_SUBST(BPGDecodeDelegate)
AC_SUBST(BPGEncodeDelegate)
AC_SUBST(BlenderDecodeDelegate)
-AC_SUBST(BZIPDelegate)
AC_SUBST(BrowseDelegate)
-AC_SUBST(CatDelegate)
AC_SUBST(ConvertDelegate)
AC_SUBST(GVCDecodeDelegate)
AC_SUBST(DVIDecodeDelegate)
-AC_SUBST(EchoDelegate)
AC_SUBST(EditorDelegate)
-AC_SUBST(GnuplotDecodeDelegate)
AC_SUBST(HPGLDecodeDelegate)
AC_SUBST(HTMLDecodeDelegate)
AC_SUBST(ILBMDecodeDelegate)
AC_SUBST(ILBMEncodeDelegate)
AC_SUBST(JXRDecodeDelegate)
AC_SUBST(JXREncodeDelegate)
+AC_SUBST(LEPDelegate)
AC_SUBST(LPDelegate)
AC_SUBST(LaunchDelegate)
-AC_SUBST(MANDelegate)
AC_SUBST(MPEGDecodeDelegate)
AC_SUBST(MPEGEncodeDelegate)
AC_SUBST(MogrifyDelegate)
AC_SUBST(MrSIDDecodeDelegate)
-AC_SUBST(MVDelegate)
AC_SUBST(PCLDelegate)
-AC_SUBST(PGPDecodeDelegate)
-AC_SUBST(POVDelegate)
AC_SUBST(PSDelegate)
-AC_SUBST(RLEEncodeDelegate)
-AC_SUBST(RMDelegate)
-AC_SUBST(SCANDecodeDelegate)
AC_SUBST(ShowImageDelegate)
-AC_SUBST(TXTDelegate)
AC_SUBST(UniconvertorDelegate)
-AC_SUBST(WMFDecodeDelegate)
AC_SUBST(WebPDecodeDelegate)
AC_SUBST(WebPEncodeDelegate)
AC_SUBST(WWWDecodeDelegate)
AC_SUBST(XPSDelegate)
-AC_SUBST(ZipDelegate)
#
# RPM support.
projects / imagemagick / blobdiff