averello/ImageMagick-mirror
1
0
Fork 0
mirror of https://github.com/ImageMagick/ImageMagick.git synced 2026-05-25 11:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Cristy
2018-10-22 19:15:12 -04:00
parent 7960ed6e61
commit 56d66f25ec
4 changed files with 263 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+1
View File
@@ -2679,6 +2679,7 @@ MAGICK_CPPFLAGS = @MAGICK_CPPFLAGS@
MAGICK_CXXFLAGS = @MAGICK_CXXFLAGS@
MAGICK_DELEGATES = @MAGICK_DELEGATES@
MAGICK_DEP_LIBS = @MAGICK_DEP_LIBS@
MAGICK_EXTRA_DEP_LIBS = @MAGICK_EXTRA_DEP_LIBS@
MAGICK_FEATURES = @MAGICK_FEATURES@
MAGICK_FILTER_MODULE_PATH = @MAGICK_FILTER_MODULE_PATH@
MAGICK_GIT_REVISION = @MAGICK_GIT_REVISION@
configure
Vendored
+117 -114
View File
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.8-13.
# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.8-14.
#
# Report bugs to <https://github.com/ImageMagick/ImageMagick/issues>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ImageMagick'
PACKAGE_TARNAME='ImageMagick'
PACKAGE_VERSION='7.0.8-13'
PACKAGE_STRING='ImageMagick 7.0.8-13'
PACKAGE_VERSION='7.0.8-14'
PACKAGE_STRING='ImageMagick 7.0.8-14'
PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues'
PACKAGE_URL='https://imagemagick.org'
@@ -642,6 +642,7 @@ MAGICK_PCFLAGS
MAGICK_CPPFLAGS
MAGICK_CXXFLAGS
MAGICK_CFLAGS
MAGICK_EXTRA_DEP_LIBS
MAGICK_DEP_LIBS
OSX_GCOV_LDFLAG
MAGICK_FEATURES
@@ -1851,7 +1852,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures ImageMagick 7.0.8-13 to adapt to many kinds of systems.
\`configure' configures ImageMagick 7.0.8-14 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1926,7 +1927,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of ImageMagick 7.0.8-13:";;
short | recursive ) echo "Configuration of ImageMagick 7.0.8-14:";;
esac
cat <<\_ACEOF
@@ -2218,7 +2219,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ImageMagick configure 7.0.8-13
ImageMagick configure 7.0.8-14
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3269,7 +3270,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by ImageMagick $as_me 7.0.8-13, which was
It was created by ImageMagick $as_me 7.0.8-14, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4255,7 +4256,7 @@ fi
# Define the identity of the package.
PACKAGE='ImageMagick'
VERSION='7.0.8-13'
VERSION='7.0.8-14'
cat >>confdefs.h <<_ACEOF
@@ -4565,11 +4566,11 @@ MAGICK_MINOR_VERSION=0
MAGICK_MICRO_VERSION=8
MAGICK_PATCHLEVEL_VERSION=13
MAGICK_PATCHLEVEL_VERSION=14
MAGICK_VERSION=7.0.8-13
MAGICK_VERSION=7.0.8-14
MAGICK_GIT_REVISION=14926:ce5e37743:20181017
MAGICK_GIT_REVISION=14938:27d088555:20181022
# Substitute library versioning
@@ -29537,8 +29538,8 @@ if test "x$with_zlib" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB" >&5
$as_echo_n "checking for ZLIB... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.0.0" >&5
$as_echo_n "checking for zlib >= 1.0.0... " >&6; }
if test -n "$ZLIB_CFLAGS"; then
pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS"
@@ -29578,7 +29579,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -29596,7 +29597,7 @@ fi
have_zlib=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_zlib=no
else
@@ -29655,8 +29656,8 @@ if test "x$with_zstd" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBZSTD" >&5
$as_echo_n "checking for LIBZSTD... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzstd >= 1.0.0" >&5
$as_echo_n "checking for libzstd >= 1.0.0... " >&6; }
if test -n "$LIBZSTD_CFLAGS"; then
pkg_cv_LIBZSTD_CFLAGS="$LIBZSTD_CFLAGS"
@@ -29696,7 +29697,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -29714,7 +29715,7 @@ fi
have_zstd=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_zstd=no
else
@@ -29945,8 +29946,8 @@ if test "x$with_autotrace" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AUTOTRACE" >&5
$as_echo_n "checking for AUTOTRACE... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autotrace >= 0.31.1" >&5
$as_echo_n "checking for autotrace >= 0.31.1... " >&6; }
if test -n "$AUTOTRACE_CFLAGS"; then
pkg_cv_AUTOTRACE_CFLAGS="$AUTOTRACE_CFLAGS"
@@ -29986,7 +29987,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -30004,7 +30005,7 @@ fi
have_autotrace=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_autotrace=no
else
@@ -30296,8 +30297,8 @@ if test "x$with_fftw" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw3" >&5
$as_echo_n "checking for fftw3... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw3 >= 3.0.0" >&5
$as_echo_n "checking for fftw3 >= 3.0.0... " >&6; }
if test -n "$fftw3_CFLAGS"; then
pkg_cv_fftw3_CFLAGS="$fftw3_CFLAGS"
@@ -30337,7 +30338,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -30355,7 +30356,7 @@ fi
have_fftw=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_fftw=no
else
@@ -30648,8 +30649,8 @@ if test "x$with_djvu" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ddjvuapi" >&5
$as_echo_n "checking for ddjvuapi... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ddjvuapi >= 3.5.0" >&5
$as_echo_n "checking for ddjvuapi >= 3.5.0... " >&6; }
if test -n "$ddjvuapi_CFLAGS"; then
pkg_cv_ddjvuapi_CFLAGS="$ddjvuapi_CFLAGS"
@@ -30689,7 +30690,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -30707,7 +30708,7 @@ fi
have_djvu=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_djvu=no
else
@@ -30767,8 +30768,8 @@ if test "x$with_fontconfig" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FONTCONFIG" >&5
$as_echo_n "checking for FONTCONFIG... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig >= 2.1.0" >&5
$as_echo_n "checking for fontconfig >= 2.1.0... " >&6; }
if test -n "$FONTCONFIG_CFLAGS"; then
pkg_cv_FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS"
@@ -30808,7 +30809,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -30826,7 +30827,7 @@ fi
have_fontconfig=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_fontconfig=no
else
@@ -30884,8 +30885,8 @@ if test "x$with_freetype" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
$as_echo_n "checking for FREETYPE... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
$as_echo_n "checking for freetype2... " >&6; }
if test -n "$FREETYPE_CFLAGS"; then
pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
@@ -30925,7 +30926,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -30943,7 +30944,7 @@ fi
have_freetype=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_freetype=no
else
@@ -31001,8 +31002,8 @@ if test "x$with_raqm" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAQM" >&5
$as_echo_n "checking for RAQM... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for raqm" >&5
$as_echo_n "checking for raqm... " >&6; }
if test -n "$RAQM_CFLAGS"; then
pkg_cv_RAQM_CFLAGS="$RAQM_CFLAGS"
@@ -31042,7 +31043,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -31060,7 +31061,7 @@ fi
have_raqm=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_raqm=no
else
@@ -31322,8 +31323,8 @@ if test "x$with_gvc" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GVC" >&5
$as_echo_n "checking for GVC... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgvc >= 2.9.0" >&5
$as_echo_n "checking for libgvc >= 2.9.0... " >&6; }
if test -n "$GVC_CFLAGS"; then
pkg_cv_GVC_CFLAGS="$GVC_CFLAGS"
@@ -31363,7 +31364,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -31381,7 +31382,7 @@ fi
have_gvc=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_gvc=no
else
@@ -31439,8 +31440,8 @@ if test "x$with_heic" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HEIF" >&5
$as_echo_n "checking for HEIF... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libheif" >&5
$as_echo_n "checking for libheif... " >&6; }
if test -n "$HEIF_CFLAGS"; then
pkg_cv_HEIF_CFLAGS="$HEIF_CFLAGS"
@@ -31480,7 +31481,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -31498,7 +31499,7 @@ fi
have_heic=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_heic=no
else
@@ -31832,8 +31833,8 @@ if test "x$with_lcms" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS2" >&5
$as_echo_n "checking for LCMS2... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcms2 >= 2.0.0" >&5
$as_echo_n "checking for lcms2 >= 2.0.0... " >&6; }
if test -n "$LCMS2_CFLAGS"; then
pkg_cv_LCMS2_CFLAGS="$LCMS2_CFLAGS"
@@ -31873,7 +31874,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -31891,7 +31892,7 @@ fi
have_lcms=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_lcms=no
else
@@ -31966,8 +31967,8 @@ if test "x$with_openjp2" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBOPENJP2" >&5
$as_echo_n "checking for LIBOPENJP2... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libopenjp2 >= 2.1.0" >&5
$as_echo_n "checking for libopenjp2 >= 2.1.0... " >&6; }
if test -n "$LIBOPENJP2_CFLAGS"; then
pkg_cv_LIBOPENJP2_CFLAGS="$LIBOPENJP2_CFLAGS"
@@ -32007,7 +32008,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -32025,7 +32026,7 @@ fi
have_openjp2=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_openjp2=no
else
@@ -32084,8 +32085,8 @@ if test "x$with_lqr" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LQR" >&5
$as_echo_n "checking for LQR... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lqr-1 >= 0.1.0" >&5
$as_echo_n "checking for lqr-1 >= 0.1.0... " >&6; }
if test -n "$LQR_CFLAGS"; then
pkg_cv_LQR_CFLAGS="$LQR_CFLAGS"
@@ -32125,7 +32126,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -32143,7 +32144,7 @@ fi
have_lqr=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_lqr=no
else
@@ -32195,8 +32196,8 @@ if test "x$with_lzma" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZMA" >&5
$as_echo_n "checking for LZMA... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblzma >= 2.9.0" >&5
$as_echo_n "checking for liblzma >= 2.9.0... " >&6; }
if test -n "$LZMA_CFLAGS"; then
pkg_cv_LZMA_CFLAGS="$LZMA_CFLAGS"
@@ -32236,7 +32237,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -32254,7 +32255,7 @@ fi
have_lzma=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_lzma=no
else
@@ -32312,8 +32313,8 @@ if test "x$with_openexr" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENEXR" >&5
$as_echo_n "checking for OPENEXR... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenEXR >= 1.0.6" >&5
$as_echo_n "checking for OpenEXR >= 1.0.6... " >&6; }
if test -n "$OPENEXR_CFLAGS"; then
pkg_cv_OPENEXR_CFLAGS="$OPENEXR_CFLAGS"
@@ -32353,7 +32354,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -32371,7 +32372,7 @@ fi
have_openexr=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_openexr=no
else
@@ -32430,8 +32431,8 @@ if test "x$with_pango" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
$as_echo_n "checking for PANGO... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pangocairo >= 1.28.1" >&5
$as_echo_n "checking for pangocairo >= 1.28.1... " >&6; }
if test -n "$PANGO_CFLAGS"; then
pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
@@ -32471,7 +32472,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -32489,7 +32490,7 @@ fi
have_pangocairo=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_pangocairo=no
else
@@ -32503,8 +32504,8 @@ fi
$as_echo "" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
$as_echo_n "checking for PANGO... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pango >= 1.28.1" >&5
$as_echo_n "checking for pango >= 1.28.1... " >&6; }
if test -n "$PANGO_CFLAGS"; then
pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
@@ -32544,7 +32545,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -32562,7 +32563,7 @@ fi
have_pango=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_pango=no
else
@@ -32635,8 +32636,8 @@ if test "x$with_png" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PNG" >&5
$as_echo_n "checking for PNG... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng >= 1.0.0" >&5
$as_echo_n "checking for libpng >= 1.0.0... " >&6; }
if test -n "$PNG_CFLAGS"; then
pkg_cv_PNG_CFLAGS="$PNG_CFLAGS"
@@ -32676,7 +32677,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -32694,7 +32695,7 @@ fi
have_png=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_png=no
else
@@ -32752,8 +32753,8 @@ if test "x$with_raw" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAW_R" >&5
$as_echo_n "checking for RAW_R... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraw_r >= 0.14.8" >&5
$as_echo_n "checking for libraw_r >= 0.14.8... " >&6; }
if test -n "$RAW_R_CFLAGS"; then
pkg_cv_RAW_R_CFLAGS="$RAW_R_CFLAGS"
@@ -32793,7 +32794,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -32811,7 +32812,7 @@ fi
have_raw=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_raw=no
else
@@ -32870,8 +32871,8 @@ if test "x$with_rsvg" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSVG" >&5
$as_echo_n "checking for RSVG... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for librsvg-2.0 >= 2.9.0" >&5
$as_echo_n "checking for librsvg-2.0 >= 2.9.0... " >&6; }
if test -n "$RSVG_CFLAGS"; then
pkg_cv_RSVG_CFLAGS="$RSVG_CFLAGS"
@@ -32911,7 +32912,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -32929,7 +32930,7 @@ fi
have_rsvg=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_rsvg=no
else
@@ -32943,8 +32944,8 @@ fi
$as_echo "" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO_SVG" >&5
$as_echo_n "checking for CAIRO_SVG... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo-svg" >&5
$as_echo_n "checking for cairo-svg... " >&6; }
if test -n "$CAIRO_SVG_CFLAGS"; then
pkg_cv_CAIRO_SVG_CFLAGS="$CAIRO_SVG_CFLAGS"
@@ -32984,7 +32985,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -33002,7 +33003,7 @@ fi
have_cairo=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_cairo=no
else
@@ -33408,8 +33409,8 @@ if test "x$with_webp" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBP" >&5
$as_echo_n "checking for WEBP... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwebp" >&5
$as_echo_n "checking for libwebp... " >&6; }
if test -n "$WEBP_CFLAGS"; then
pkg_cv_WEBP_CFLAGS="$WEBP_CFLAGS"
@@ -33449,7 +33450,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -33467,7 +33468,7 @@ fi
have_webp=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_webp=no
else
@@ -33479,8 +33480,8 @@ $as_echo "yes" >&6; }
fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBPMUX" >&5
$as_echo_n "checking for WEBPMUX... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwebpmux >= 0.4.4" >&5
$as_echo_n "checking for libwebpmux >= 0.4.4... " >&6; }
if test -n "$WEBPMUX_CFLAGS"; then
pkg_cv_WEBPMUX_CFLAGS="$WEBPMUX_CFLAGS"
@@ -33520,7 +33521,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -33538,7 +33539,7 @@ fi
have_webpmux=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_webpmux=no
else
@@ -33745,8 +33746,8 @@ if test "x$with_xml" = "xyes"; then
$as_echo "-------------------------------------------------------------" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML" >&5
$as_echo_n "checking for XML... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.0.0" >&5
$as_echo_n "checking for libxml-2.0 >= 2.0.0... " >&6; }
if test -n "$XML_CFLAGS"; then
pkg_cv_XML_CFLAGS="$XML_CFLAGS"
@@ -33786,7 +33787,7 @@ fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -33804,7 +33805,7 @@ fi
have_xml=no
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
have_xml=no
else
@@ -36924,10 +36925,12 @@ fi
#
if test "$build_modules" != 'no'; then
MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $XML_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $XML_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
else
MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_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 $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_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 $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
fi
MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS"
# Pass only user-provided LIBS as "global" libraries
@@ -36945,7 +36948,7 @@ MAGICK_CXXFLAGS="$CXXFLAGS"
MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'`
MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'`
MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
MAGICK_LIBS="$MAGICK_DEP_LIBS"
MAGICK_LIBS="$MAGICK_DEP_LIBS MAGICK_EXTRA_DEP_LIBS"
@@ -37771,7 +37774,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by ImageMagick $as_me 7.0.8-13, which was
This file was extended by ImageMagick $as_me 7.0.8-14, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -37838,7 +37841,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ImageMagick config.status 7.0.8-13
ImageMagick config.status 7.0.8-14
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -40029,7 +40032,7 @@ matches your expectations.
PCFLAGS = $PCFLAGS
DEFS = $DEFS
LDFLAGS = $LDFLAGS
LIBS = $LIBS
LIBS = $MAGICK_DEP_LIBS
CXX = $CXX
CXXFLAGS = $CXXFLAGS
FEATURES = $MAGICK_FEATURES
@@ -40121,7 +40124,7 @@ matches your expectations.
PCFLAGS = $PCFLAGS
DEFS = $DEFS
LDFLAGS = $LDFLAGS
LIBS = $LIBS
LIBS = $MAGICK_DEP_LIBS
CXX = $CXX
CXXFLAGS = $CXXFLAGS
FEATURES = $MAGICK_FEATURES
configure.ac
+6 -4
View File
@@ -3917,11 +3917,13 @@ fi
#
if test "$build_modules" != 'no'; then
MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $XML_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $XML_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
else
MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_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 $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_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 $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
fi
MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS"
AC_SUBST(MAGICK_DEP_LIBS)
AC_SUBST(MAGICK_EXTRA_DEP_LIBS)
# Pass only user-provided LIBS as "global" libraries
LIBS=$USER_LIBS
@@ -3938,7 +3940,7 @@ MAGICK_CXXFLAGS="$CXXFLAGS"
MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'`
MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'`
MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
MAGICK_LIBS="$MAGICK_DEP_LIBS"
MAGICK_LIBS="$MAGICK_DEP_LIBS MAGICK_EXTRA_DEP_LIBS"
AC_SUBST(MAGICK_CFLAGS)
AC_SUBST(MAGICK_CXXFLAGS)
@@ -4120,7 +4122,7 @@ matches your expectations.
PCFLAGS = $PCFLAGS
DEFS = $DEFS
LDFLAGS = $LDFLAGS
LIBS = $LIBS
LIBS = $MAGICK_DEP_LIBS
CXX = $CXX
CXXFLAGS = $CXXFLAGS
FEATURES = $MAGICK_FEATURES
m4/pkg.m4
+139 -78
View File
@@ -1,29 +1,60 @@
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 12 (pkg-config-0.29.2)
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
# ----------------------------------
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 2 of the License, or
dnl (at your option) any later version.
dnl
dnl This program is distributed in the hope that it will be useful, but
dnl WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dnl General Public License for more details.
dnl
dnl You should have received a copy of the GNU General Public License
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
dnl 02111-1307, USA.
dnl
dnl As a special exception to the GNU General Public License, if you
dnl distribute this file as part of a program that contains a
dnl configuration script generated by Autoconf, you may include it under
dnl the same distribution terms that you use for the rest of that
dnl program.
dnl PKG_PREREQ(MIN-VERSION)
dnl -----------------------
dnl Since: 0.29
dnl
dnl Verify that the version of the pkg-config macros are at least
dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
dnl installed version of pkg-config, this checks the developer's version
dnl of pkg.m4 when generating configure.
dnl
dnl To ensure that this macro is defined, also add:
dnl m4_ifndef([PKG_PREREQ],
dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
dnl
dnl See the "Since" comment for each macro you use to see what version
dnl of the macros you require.
m4_defun([PKG_PREREQ],
[m4_define([PKG_MACROS_VERSION], [0.29.2])
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
])dnl PKG_PREREQ
dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
dnl ----------------------------------
dnl Since: 0.16
dnl
dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
dnl first found in the path. Checks that the version of pkg-config found
dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
dnl used since that's the first version where most current features of
dnl pkg-config existed.
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -45,18 +76,19 @@ if test -n "$PKG_CONFIG"; then
PKG_CONFIG=""
fi
fi[]dnl
])# PKG_PROG_PKG_CONFIG
])dnl PKG_PROG_PKG_CONFIG
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
#
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
# only at the first occurence in configure.ac, so if the first place
# it's called might be skipped (such as if it is within an "if", you
# have to call PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
dnl -------------------------------------------------------------------
dnl Since: 0.18
dnl
dnl Check to see whether a particular set of modules exists. Similar to
dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
dnl
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
dnl only at the first occurence in configure.ac, so if the first place
dnl it's called might be skipped (such as if it is within an "if", you
dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
@@ -66,8 +98,10 @@ m4_ifvaln([$3], [else
$3])dnl
fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
dnl ---------------------------------------------
dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
dnl pkg_failed based on the result.
m4_define([_PKG_CONFIG],
[if test -n "$$1"; then
pkg_cv_[]$1="$$1"
@@ -79,10 +113,11 @@ m4_define([_PKG_CONFIG],
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
])dnl _PKG_CONFIG
# _PKG_SHORT_ERRORS_SUPPORTED
# -----------------------------
dnl _PKG_SHORT_ERRORS_SUPPORTED
dnl ---------------------------
dnl Internal check to see if pkg-config supports short errors.
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -90,26 +125,24 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
else
_pkg_short_errors_supported=no
fi[]dnl
])# _PKG_SHORT_ERRORS_SUPPORTED
])dnl _PKG_SHORT_ERRORS_SUPPORTED
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
#
# Note that if there is a possibility the first call to
# PKG_CHECK_MODULES might not happen, you should be sure to include an
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
#
# --------------------------------------------------------------
dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
dnl [ACTION-IF-NOT-FOUND])
dnl --------------------------------------------------------------
dnl Since: 0.4.0
dnl
dnl Note that if there is a possibility the first call to
dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
AC_MSG_CHECKING([for $1])
AC_MSG_CHECKING([for $2])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -119,11 +152,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@@ -140,7 +173,7 @@ installed software in a non-standard prefix.
_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -156,16 +189,40 @@ else
AC_MSG_RESULT([yes])
$3
fi[]dnl
])# PKG_CHECK_MODULES
])dnl PKG_CHECK_MODULES
# PKG_INSTALLDIR(DIRECTORY)
# -------------------------
# Substitutes the variable pkgconfigdir as the location where a module
# should install pkg-config .pc files. By default the directory is
# $libdir/pkgconfig, but the default can be changed by passing
# DIRECTORY. The user can override through the --with-pkgconfigdir
# parameter.
dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
dnl [ACTION-IF-NOT-FOUND])
dnl ---------------------------------------------------------------------
dnl Since: 0.29
dnl
dnl Checks for existence of MODULES and gathers its build flags with
dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
dnl and VARIABLE-PREFIX_LIBS from --libs.
dnl
dnl Note that if there is a possibility the first call to
dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
dnl configure.ac.
AC_DEFUN([PKG_CHECK_MODULES_STATIC],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
_save_PKG_CONFIG=$PKG_CONFIG
PKG_CONFIG="$PKG_CONFIG --static"
PKG_CHECK_MODULES($@)
PKG_CONFIG=$_save_PKG_CONFIG[]dnl
])dnl PKG_CHECK_MODULES_STATIC
dnl PKG_INSTALLDIR([DIRECTORY])
dnl -------------------------
dnl Since: 0.27
dnl
dnl Substitutes the variable pkgconfigdir as the location where a module
dnl should install pkg-config .pc files. By default the directory is
dnl $libdir/pkgconfig, but the default can be changed by passing
dnl DIRECTORY. The user can override through the --with-pkgconfigdir
dnl parameter.
AC_DEFUN([PKG_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -176,16 +233,18 @@ AC_ARG_WITH([pkgconfigdir],
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
]) dnl PKG_INSTALLDIR
])dnl PKG_INSTALLDIR
# PKG_NOARCH_INSTALLDIR(DIRECTORY)
# -------------------------
# Substitutes the variable noarch_pkgconfigdir as the location where a
# module should install arch-independent pkg-config .pc files. By
# default the directory is $datadir/pkgconfig, but the default can be
# changed by passing DIRECTORY. The user can override through the
# --with-noarch-pkgconfigdir parameter.
dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
dnl --------------------------------
dnl Since: 0.27
dnl
dnl Substitutes the variable noarch_pkgconfigdir as the location where a
dnl module should install arch-independent pkg-config .pc files. By
dnl default the directory is $datadir/pkgconfig, but the default can be
dnl changed by passing DIRECTORY. The user can override through the
dnl --with-noarch-pkgconfigdir parameter.
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -196,13 +255,15 @@ AC_ARG_WITH([noarch-pkgconfigdir],
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
]) dnl PKG_NOARCH_INSTALLDIR
])dnl PKG_NOARCH_INSTALLDIR
# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
# -------------------------------------------
# Retrieves the value of the pkg-config variable for the given module.
dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
dnl -------------------------------------------
dnl Since: 0.28
dnl
dnl Retrieves the value of the pkg-config variable for the given module.
AC_DEFUN([PKG_CHECK_VAR],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -211,4 +272,4 @@ _PKG_CONFIG([$1], [variable="][$3]["], [$2])
AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])# PKG_CHECK_VAR
])dnl PKG_CHECK_VAR