From 6632c0698b77dd2950de355095ab6dc572f4e34b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <lucio@lucioillanes.de>
Date: Wed, 29 Nov 2017 13:57:42 +0000
Subject: vars/build.vars:${DEFAULT_CONFIG_CACHE}: adds
 `xorg_cv_malloc0_returns_null=yes'. vars/libX11.vars: merged & removed.

---
 vars/build.vars  | 3 ++-
 vars/libX11.vars | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 vars/libX11.vars

diff --git a/vars/build.vars b/vars/build.vars
index e77a0971..ca4cdefb 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -11,7 +11,8 @@ ac_cv_func_realloc_0_nonnull=yes
 ac_cv_func_strcoll_works=yes
 ac_cv_func_strnlen_working=yes
 ac_cv_func_working_mktime=yes
-gt_cv_int_divbyzero_sigfpe=yes"};
+gt_cv_int_divbyzero_sigfpe=yes
+xorg_cv_malloc0_returns_null=yes"};
 
 #
 # Build target invariants
diff --git a/vars/libX11.vars b/vars/libX11.vars
deleted file mode 100644
index a40ab8c9..00000000
--- a/vars/libX11.vars
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# set -o errexit -o noglob are assumed.
-#
-
-: ${PKG_LIBX11_CONFIG_CACHE_EXTRA:="
-xorg_cv_malloc0_returns_null=yes"};
-
-# vim:filetype=sh
-- 
cgit v1.2.3