gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-09 15:24:12 +01:00
Code Issues Projects Releases Wiki Activity

Configure: Rewrite detection for Xft2 to properly use PKG_CONFIG macro

Browse Source 
The goal is to use standard macros, which make code easier to maintain
(smaller, more consistent). We still keep the legacy "xfg-config" method
because we don't want to drop support for old hardware/software.

A side effect is the change in the name of the variables for the makefile,
but this goes in favour of consistency.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2021-05-22 16:39:07 +02:00
committed by Carlos R. Mafra
parent 0e274dc979
commit 0bbb122b94
6 changed files with 26 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
m4/windowmaker.m4
View File

@@ -26,13 +26,13 @@ m4_pattern_allow([^WM_OSDEP(_[A-Z]*)?$])
# WM_CHECK_XFT_VERSION(MIN_VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]])
#
# $XFTFLAGS should be defined before calling this macro,
# $XFT_CFLAGS should be defined before calling this macro,
# else it will not be able to find Xft.h
#
AC_DEFUN([WM_CHECK_XFT_VERSION],
[
CPPFLAGS_old="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XFTFLAGS $inc_search_path"
CPPFLAGS="$CPPFLAGS $XFT_CFLAGS $inc_search_path"
xft_major_version=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
xft_minor_version=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
xft_micro_version=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`