Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include search over new possible directories for MagickWand in Debian 8 #17

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Include search over new possible directories for MagickWand in Debian 8 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9c0918
Include search over new possible directories for MagickWand in Debian 8
Sep 14, 2015
1192501
Include search over new possible directories for MagickWand in Debian…
Sep 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ php:

before_install:
- sudo apt-get update
- sudo apt-get install libzbar0 libzbar-dev
- sudo apt-get install libzbar0 libzbar-dev libmagickwand-*
script:
- export NO_INTERACTION=1
- export REPORT_EXIT_STATUS=1
Expand Down
23 changes: 12 additions & 11 deletions imagemagick.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,34 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[

AC_MSG_CHECKING(ImageMagick MagickWand API configuration program)

LMW_ARRAY=$(find /usr/lib/ -name *Wand-config -exec dirname {} \;)

if test "$2" != "yes"; then
for i in "$2" /usr/local /usr /opt /opt/local;
for i in "$2/bin" /usr/local/bin /usr/bin /opt/bin /opt/local/bin $LMW_ARRAY;
do
if test -r "${i}/bin/MagickWand-config"; then
IM_WAND_BINARY="${i}/bin/MagickWand-config"
if test -r "${i}/MagickWand-config"; then
IM_WAND_BINARY="${i}/MagickWand-config"
IM_IMAGEMAGICK_PREFIX=$i
break
fi

if test -r "${i}/bin/Wand-config"; then
IM_WAND_BINARY="${i}/bin/Wand-config"
if test -r "${i}/Wand-config"; then
IM_WAND_BINARY="${i}/Wand-config"
IM_IMAGEMAGICK_PREFIX=$i
break
fi
done
else
for i in /usr/local /usr /opt /opt/local;
for i in /usr/local /usr /opt /opt/local $LMW_ARRAY;
do
if test -r "${i}/bin/MagickWand-config"; then
IM_WAND_BINARY="${i}/bin/MagickWand-config"
if test -r "${i}/MagickWand-config"; then
IM_WAND_BINARY="${i}/MagickWand-config"
IM_IMAGEMAGICK_PREFIX=$i
break
fi

if test -r "${i}/bin/Wand-config"; then
IM_WAND_BINARY="${i}/bin/Wand-config"
if test -r "${i}/Wand-config"; then
IM_WAND_BINARY="${i}/Wand-config"
IM_IMAGEMAGICK_PREFIX=$i
break
fi
Expand Down Expand Up @@ -143,4 +145,3 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[
export IM_IMAGEMAGICK_LIBS
export IM_IMAGEMAGICK_CFLAGS
])