diff options
| author | Alan Third <alan@idiocy.org> | 2018-01-09 23:47:56 +0000 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2018-01-27 16:31:31 +0000 |
| commit | 848797ada4bc885e145bcace6a4b2cf4ed324216 (patch) | |
| tree | d475d52ca4dc531e124ce9745987931008853540 /configure.ac | |
| parent | d1cfe4641d89259210304cf75011a22cc765e2ed (diff) | |
| download | emacs-848797ada4bc885e145bcace6a4b2cf4ed324216.tar.gz | |
Allow configure to find Homebrew installed imagemagick
* configure.ac: Add the imagemagick pkgconfig dir to pkg-config's
search path.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index eb7e5ee2607..a09ae6a5922 100644 --- a/configure.ac +++ b/configure.ac @@ -1269,10 +1269,10 @@ AC_SUBST([PAXCTL_notdumped]) # Makeinfo on macOS is ancient, check whether there is a more recent # version installed by Homebrew. -AC_CHECK_PROG(HAVE_BREW, [brew], [yes]) -if test -n "$HAVE_BREW"; then +AC_CHECK_PROGS(BREW, [brew]) +if test -n "$BREW"; then AC_PATH_PROG([MAKEINFO], [makeinfo], [], - [`brew --prefix texinfo 2>/dev/null`/bin$PATH_SEPARATOR$PATH]) + [`$BREW --prefix texinfo 2>/dev/null`/bin$PATH_SEPARATOR$PATH]) fi ## Require makeinfo >= 4.13 (last of the 4.x series) to build the manuals. @@ -2535,6 +2535,12 @@ fi HAVE_IMAGEMAGICK=no if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_imagemagick}" != "no"; then + if test -n "$BREW"; then + # Homebrew doesn't link ImageMagick 6 by default, so make sure + # pkgconfig can find it. + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH$PATH_SEPARATOR`$BREW --prefix imagemagick@6 2>/dev/null`/lib/pkgconfig" + fi + ## 6.3.5 is the earliest version known to work; see Bug#17339. ## 6.8.2 makes Emacs crash; see Bug#13867. ## 7 and later have not been ported to; See Bug#25967. |