gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-14 21:15:50 +01:00
Code Issues Projects Releases Wiki Activity

wrlib: grouped the detection of ImageMagick in the CHECK_MAGICK macro

Browse Source 
Took the opportunity to expand the WM_LIB_CHECK macro because it is not
suited for the case where compilation flags can be queried but was meant
for the case when they have to be guessed

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-05-08 20:16:01 +02:00
committed by Carlos R. Mafra
parent 9a0c3ab737
commit 698cffacc5
2 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
configure.ac
View File

@@ -322,11 +322,6 @@ dnl ==========
dnl AC_ARG_VAR(PKGCONFIG, [pkg-config command])
AC_CHECK_PROG(PKGCONFIG, pkg-config, pkg-config)
dnl MagickWand-config
dnl ==========
dnl AC_ARG_VAR(MAGICKWCONFIG, [MagickWand-config command])
AC_CHECK_PROG(MAGICKWCONFIG, MagickWand-config, MagickWand-config)
dnl gettext
dnl =======
@@ -564,26 +559,6 @@ else
fi
AC_SUBST(FCLIBS)
dnl
dnl libMagickWand
dnl
AC_MSG_CHECKING([for libmagickwand header])
MAGICKFLAGS=`$MAGICKWCONFIG --cflags`
if test "x$MAGICKFLAGS" = "x" ; then
AC_MSG_RESULT([not found])
else
AC_MSG_RESULT([found])
fi
AC_SUBST(MAGICKFLAGS)
AC_MSG_CHECKING([for libmagickwand library])
MAGICKLIBS=`$MAGICKWCONFIG --ldflags`
if test "x$MAGICKLIBS" = "x" ; then
AC_MSG_RESULT([not found])
else
AC_MSG_RESULT([found])
fi
AC_SUBST(MAGICKLIBS)
dnl Xft2 antialiased font support
dnl =============================