Author: cazfi
Date: Mon Oct 5 04:32:45 2015
New Revision: 30015
URL: http://svn.gna.org/viewcvs/freeciv?rev=30015&view=rev
Log:
Fallback to using pkg-config if MagickWand-config is not found.
See bug #23906
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=30015&r1=30014&r2=30015&view=diff
==============================================================================
--- branches/S2_6/m4/magickwand.m4 (original)
+++ branches/S2_6/m4/magickwand.m4 Mon Oct 5 04:32:45 2015
@@ -42,10 +42,7 @@
if test -z "$WAND_CONFIG_PATH"; then
AC_MSG_RESULT(no)
- WAND_CFLAGS=""
- WAND_LIBS=""
-
- wand=no
+ PKG_CHECK_MODULES([WAND], [MagickWand], [wand=yes], [wand=no])
else
AC_MSG_RESULT([found in $WAND_CONFIG_PATH])
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
