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

Do not stop compilation if library Xmu is not found

Browse Source 
We use only 1 function from this library, and it is in a case that should
be rare nowadays: displays with indexed color.
This commit makes it acceptable to compile if the library is missing.
This commit is contained in:
Christophe CURIS
2019-05-04 14:58:48 +02:00
committed by Carlos R. Mafra
parent 4665972175
commit e2cfed3377
3 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
m4/wm_xext_check.m4
View File

@@ -90,12 +90,11 @@ AC_DEFUN_ONCE([WM_EXT_CHECK_XMU],
AS_IF([wm_fn_lib_try_link "XmuLookupStandardColormap" "-lXmu"],
[wm_cv_xext_xmu="-lXmu"])
LIBS="$wm_save_LIBS"
AS_IF([test "x$wm_cv_xext_xmu" = "xno"],
[AC_MSG_ERROR([library Xmu not found])])
dnl
dnl A library was found, check if header is available and compile
wm_save_CFLAGS="$CFLAGS"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([dnl
AS_IF([test "x$wm_cv_xext_xmu" != "xno"],
[dnl
dnl A library was found, check if header is available and compile
wm_save_CFLAGS="$CFLAGS"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([dnl
@%:@include <X11/Xlib.h>
@%:@include <X11/Xutil.h>
@%:@include <X11/Xmu/StdCmap.h>
@@ -104,11 +103,18 @@ Display *dpy;
Atom prop;
], [dnl
XmuLookupStandardColormap(dpy, 0, 0, 0, prop, False, True);]) ],
[],
[AC_MSG_ERROR([found $wm_cv_xext_xmu but cannot compile with the header])])
CFLAGS="$wm_save_CFLAGS"])
[],
[AC_MSG_ERROR([found $wm_cv_xext_xmu but cannot compile with the header])])
CFLAGS="$wm_save_CFLAGS"])
])
dnl The cached check already reported problems when not found
LIBXMU="$wm_cv_xext_xmu"
AS_IF([test "wm_cv_xext_xmu" = "xno"],
[LIBXMU=""
unsupported="$unsupported Xmu"],
[AC_DEFINE([HAVE_LIBXMU], [1],
[defined when the libXmu library was found])
LIBXMU="$wm_cv_xext_xmu"
supported_xext="$supported_xext Xmu"])
AC_SUBST(LIBXMU)dnl
])