gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 04:20:27 +01:00
Code Issues Projects Releases Wiki Activity

wrlib: renamed compilation flags variables with a name less prone to clash

Browse Source
This commit is contained in:
Christophe CURIS
2014-05-08 20:15:58 +02:00
committed by Carlos R. Mafra
parent c3139e9d0c
commit 79bad0d14c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -568,22 +568,22 @@ dnl
dnl libMagickWand dnl libMagickWand
dnl dnl
AC_MSG_CHECKING([for libmagickwand header]) AC_MSG_CHECKING([for libmagickwand header])
IMFLAGS=`$MAGICKWCONFIG --cflags` MAGICKFLAGS=`$MAGICKWCONFIG --cflags`
if test "x$IMFLAGS" = "x" ; then if test "x$MAGICKFLAGS" = "x" ; then
AC_MSG_RESULT([not found]) AC_MSG_RESULT([not found])
else else
AC_MSG_RESULT([found]) AC_MSG_RESULT([found])
fi fi
AC_SUBST(IMFLAGS) AC_SUBST(MAGICKFLAGS)
AC_MSG_CHECKING([for libmagickwand library]) AC_MSG_CHECKING([for libmagickwand library])
IMLIBS=`$MAGICKWCONFIG --ldflags` MAGICKLIBS=`$MAGICKWCONFIG --ldflags`
if test "x$IMLIBS" = "x" ; then if test "x$MAGICKLIBS" = "x" ; then
AC_MSG_RESULT([not found]) AC_MSG_RESULT([not found])
else else
AC_MSG_RESULT([found]) AC_MSG_RESULT([found])
fi fi
AC_SUBST(IMLIBS) AC_SUBST(MAGICKLIBS)
dnl Xft2 antialiased font support dnl Xft2 antialiased font support
dnl ============================= dnl =============================

4
m4/wm_imgfmt_check.m4
View File

@@ -259,8 +259,8 @@ AM_CONDITIONAL([USE_XPM], [test "x$enable_xpm" != "xno"])dnl
# and MAGICKLIBS, and append info to the variable 'supported_gfx' # and MAGICKLIBS, and append info to the variable 'supported_gfx'
# When not found, append info to variable 'unsupported' # When not found, append info to variable 'unsupported'
AC_DEFUN_ONCE([WM_IMGFMT_CHECK_MAGICK], AC_DEFUN_ONCE([WM_IMGFMT_CHECK_MAGICK],
[WM_LIB_CHECK([MAGICK], ["$IMLIBS"], [MagickGetImagePixels], [$XLFLAGS $XLIBS], [WM_LIB_CHECK([MAGICK], ["$MAGICKLIBS"], [MagickGetImagePixels], [$XLFLAGS $XLIBS],
[wm_save_CFLAGS="$CFLAGS $IMFLAGS" [wm_save_CFLAGS="$CFLAGS $MAGICKLIBS"
AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "" "return 0" ""], AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "" "return 0" ""],
[], [],
[AC_MSG_ERROR([found $CACHEVAR but could not find appropriate header - are you missing libmagickwand package?])]) [AC_MSG_ERROR([found $CACHEVAR but could not find appropriate header - are you missing libmagickwand package?])])