Author: cazfi
Date: Thu Apr 7 17:23:29 2016
New Revision: 32311
URL: http://svn.gna.org/viewcvs/freeciv?rev=32311&view=rev
Log:
Prefer pkg-config method of finding ImageMagick development files.
See patch #6939
Modified:
branches/S2_6/m4/magickwand.m4
Modified: branches/S2_6/m4/magickwand.m4
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/magickwand.m4?rev=32311&r1=32310&r2=32311&view=diff
==============================================================================
--- branches/S2_6/m4/magickwand.m4 (original)
+++ branches/S2_6/m4/magickwand.m4 Thu Apr 7 17:23:29 2016
@@ -10,21 +10,25 @@
WAND_CONFIG_PATH=""
if test "x$magickwand_dir" = "x" ; then
- AC_MSG_CHECKING([for MagickWand-config in default path])
+ PKG_CHECK_MODULES([WAND], [MagickWand], [wand=yes], [wand=no])
- for i in /usr/local /usr;
- do
- test -r $i/bin/${host}-MagicWand-config &&
- WAND_CONFIG_PATH=$i/bin && WAND_CONFIG_NAME=${host}-MagickWand-config &&
- break
- done
+ if test "x$wand" = "xno" ; then
+ AC_MSG_CHECKING([for MagickWand-config in default path])
- if test x$WAND_CONFIG_PATH = x ; then
for i in /usr/local /usr;
do
- test -r $i/bin/MagickWand-config &&
- WAND_CONFIG_PATH=$i/bin && WAND_CONFIG_NAME=MagickWand-config && break
+ test -r $i/bin/${host}-MagicWand-config &&
+ WAND_CONFIG_PATH=$i/bin && WAND_CONFIG_NAME=${host}-MagickWand-config
&&
+ break
done
+
+ if test x$WAND_CONFIG_PATH = x ; then
+ for i in /usr/local /usr;
+ do
+ test -r $i/bin/MagickWand-config &&
+ WAND_CONFIG_PATH=$i/bin && WAND_CONFIG_NAME=MagickWand-config &&
break
+ done
+ fi
fi
else
AC_MSG_CHECKING([for MagickWand-config])
@@ -39,23 +43,25 @@
fi
fi
- if test -z "$WAND_CONFIG_PATH"; then
- AC_MSG_RESULT(no)
+ if test "x$wand" != "xyes" ; then
+ if test -z "$WAND_CONFIG_PATH" ; then
+ AC_MSG_RESULT([no])
+ else
+ AC_MSG_RESULT([found in $WAND_CONFIG_PATH])
- PKG_CHECK_MODULES([WAND], [MagickWand], [wand=yes], [wand=no])
- else
- AC_MSG_RESULT([found in $WAND_CONFIG_PATH])
+ AC_MSG_CHECKING([for $WAND_CONFIG_NAME --cflags])
+ WAND_CFLAGS="`$WAND_CONFIG_PATH/$WAND_CONFIG_NAME --cflags`"
+ AC_MSG_RESULT([$WAND_CFLAGS])
- AC_MSG_CHECKING([for $WAND_CONFIG_NAME --cflags])
- WAND_CFLAGS="`$WAND_CONFIG_PATH/$WAND_CONFIG_NAME --cflags`"
- AC_MSG_RESULT([$WAND_CFLAGS])
+ AC_MSG_CHECKING([for $WAND_CONFIG_NAME --libs])
+ WAND_LIBS="`$WAND_CONFIG_PATH/$WAND_CONFIG_NAME --libs`"
+ AC_MSG_RESULT([$WAND_LIBS])
- AC_MSG_CHECKING([for $WAND_CONFIG_NAME --libs])
- WAND_LIBS="`$WAND_CONFIG_PATH/$WAND_CONFIG_NAME --libs`"
- AC_MSG_RESULT([$WAND_LIBS])
+ wand=yes
+ fi
+ fi
- wand=yes
-
+ if test "x$wand" = "xyes" ; then
dnl
dnl MagickWand uses -lbz2 (at least on opensuse) - test it
dnl
@@ -78,8 +84,8 @@
LIBS="$ac_save_LIBS"
fi
- AC_SUBST(WAND_CFLAGS)
- AC_SUBST(WAND_LIBS)
+ AC_SUBST([WAND_CFLAGS])
+ AC_SUBST([WAND_LIBS])
if test "x$wand" = "xyes" ; then
ifelse([$1], , :, [$1])
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
