gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-23 18:45:56 +01:00
Code Issues Projects Releases Wiki Activity

configure: Created new macro to append only once a flag to a variable

Browse Source 
Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2013-11-17 22:30:16 +01:00
committed by Carlos R. Mafra
parent fbe202f49b
commit da597a4b87
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
m4/windowmaker.m4
View File

@@ -102,3 +102,22 @@ $[]2], [ $[]3;])],
AS_SET_STATUS([$wm_retval]) AS_SET_STATUS([$wm_retval])
} }
]) ])
# WM_APPEND_ONCE
# --------------
#
# Append flags to a variable, but only if not already present
#
# Usage: WM_APPEND_ONCE([libflags], [variable])
# $1 libflags: the list of flag to append
# $2 variable: the variable, if unset use LIBS
AC_DEFUN([WM_APPEND_ONCE],
[AS_VAR_PUSHDEF([VAR], [m4_ifnblank([$2], [$2], [LIBS])])dnl
for wm_arg in $1 ; do
AS_IF([echo " $VAR " | grep " $wm_arg " 2>&1 >/dev/null],
[@%:@ Flag already present in VAR],
[VAR="$VAR $wm_arg"])
done
AS_VAR_POPDEF([VAR])dnl
])

12
m4/wm_imgfmt_check.m4
View File

@@ -70,12 +70,12 @@ const char *filename = "dummy";],
[unsupported="$unsupported GIF" [unsupported="$unsupported GIF"
enable_gif="no"], enable_gif="no"],
[supported_gfx="$supported_gfx GIF" [supported_gfx="$supported_gfx GIF"
GFXLIBS="$GFXLIBS `echo "$wm_cv_imgfmt_gif" | sed -e 's, *version:.*,,' `" WM_APPEND_ONCE([`echo "$wm_cv_imgfmt_gif" | sed -e 's, *version:.*,,' `], [GFXLIBS])
AC_DEFINE_UNQUOTED([USE_GIF], AC_DEFINE_UNQUOTED([USE_GIF],
[`echo "$wm_cv_imgfmt_gif" | sed -e 's,.*version:,,' `], [`echo "$wm_cv_imgfmt_gif" | sed -e 's,.*version:,,' `],
[defined when valid GIF library with header was found])]) [defined when valid GIF library with header was found])])
]) ])
AM_CONDITIONAL([USE_GIF], [test "x$enable_gif" != "xno"])dnl AM_CONDITIONAL([USE_GIF], [test "x$enable_gif" != "xno"])dnl
]) dnl AC_DEFUN ]) dnl AC_DEFUN
@@ -128,7 +128,7 @@ AS_IF([test "x$enable_jpeg" = "xno"],
[unsupported="$unsupported JPEG" [unsupported="$unsupported JPEG"
enable_jpeg="no"], enable_jpeg="no"],
[supported_gfx="$supported_gfx JPEG" [supported_gfx="$supported_gfx JPEG"
GFXLIBS="$GFXLIBS $wm_cv_imgfmt_jpeg" WM_APPEND_ONCE([$wm_cv_imgfmt_jpeg], [GFXLIBS])
AC_DEFINE([USE_JPEG], [1], AC_DEFINE([USE_JPEG], [1],
[defined when valid JPEG library with header was found])]) [defined when valid JPEG library with header was found])])
]) ])
@@ -180,7 +180,7 @@ AS_IF([test "x$enable_png" = "xno"],
[unsupported="$unsupported PNG" [unsupported="$unsupported PNG"
enable_png="no"], enable_png="no"],
[supported_gfx="$supported_gfx PNG" [supported_gfx="$supported_gfx PNG"
GFXLIBS="$GFXLIBS $wm_cv_imgfmt_png" WM_APPEND_ONCE([$wm_cv_imgfmt_png], [GFXLIBS])
AC_DEFINE([USE_PNG], [1], AC_DEFINE([USE_PNG], [1],
[defined when valid PNG library with header was found])]) [defined when valid PNG library with header was found])])
]) ])
@@ -240,7 +240,7 @@ AS_IF([test "x$enable_tiff" = "xno"],
[unsupported="$unsupported TIFF" [unsupported="$unsupported TIFF"
enable_tiff="no"], enable_tiff="no"],
[supported_gfx="$supported_gfx TIFF" [supported_gfx="$supported_gfx TIFF"
GFXLIBS="$GFXLIBS $wm_cv_imgfmt_tiff" WM_APPEND_ONCE([$wm_cv_imgfmt_tiff], [GFXLIBS])
AC_DEFINE([USE_TIFF], [1], AC_DEFINE([USE_TIFF], [1],
[defined when valid TIFF library with header was found])]) [defined when valid TIFF library with header was found])])
]) ])
@@ -289,7 +289,7 @@ AS_IF([test "x$enable_xpm" = "xno"],
[supported_gfx="$supported_gfx builtin-XPM" [supported_gfx="$supported_gfx builtin-XPM"
enable_xpm="no"], enable_xpm="no"],
[supported_gfx="$supported_gfx XPM" [supported_gfx="$supported_gfx XPM"
GFXLIBS="$GFXLIBS $wm_cv_imgfmt_xpm" WM_APPEND_ONCE([$wm_cv_imgfmt_xpm], [GFXLIBS])
AC_DEFINE([USE_XPM], [1], AC_DEFINE([USE_XPM], [1],
[defined when valid XPM library with header was found])]) [defined when valid XPM library with header was found])])
]) ])