From 14b2db63e7ae0c0d356062cd15811484038f97d9 Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Sun, 29 Aug 2004 21:06:00 +0000
Subject: [PATCH] =?UTF-8?q?Fix=20make=20install=20when=20BuildServersOnly?=
 =?UTF-8?q?=20is=20YES=20(Bug=20#1213).=20Fix=20build=20failures=20when=20?=
 =?UTF-8?q?UseDeprecatedKeyboardDriver=20is=20YES=20and=20=20=20=20=20DoLo?=
 =?UTF-8?q?adableServer=20is=20NO=20(Bug=20#1229,=20Kristian=20H=F8gsberg)?=
 =?UTF-8?q?.=20Fix=20failure=20when=20using=20DLL=20loader=20and=20LD=5FBI?=
 =?UTF-8?q?ND=5FNOW=20is=20set=20(Bug=20#1212,=20Adam=20=20=20=20=20Jackso?=
 =?UTF-8?q?n).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hw/xfree86/loader/loader.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c
index efa60f20a..14c9a320d 100644
--- a/hw/xfree86/loader/loader.c
+++ b/hw/xfree86/loader/loader.c
@@ -331,6 +331,13 @@ LoaderInit(void)
 {
     const char *osname = NULL;
 
+#ifdef DLOPEN_SUPPORT
+    char *ld_bind_now = getenv("LD_BIND_NOW");
+    if (ld_bind_now && *ld_bind_now) {
+        xf86Msg(X_ERROR, "LD_BIND_NOW is set, dlloader will NOT work!\n");
+    }
+#endif
+
     LoaderAddSymbols(-1, -1, miLookupTab);
     LoaderAddSymbols(-1, -1, xfree86LookupTab);
     LoaderAddSymbols(-1, -1, dixLookupTab);