summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2004-08-29 21:06:00 +0000
committerKevin E Martin <kem@kem.org>2004-08-29 21:06:00 +0000
commit14b2db63e7ae0c0d356062cd15811484038f97d9 (patch)
treee4a146f6f2f75762d96335211e29fe67d823c776
parentac038e9cc6f7708fdd9f36494861d2f611d5a90a (diff)
Fix make install when BuildServersOnly is YES (Bug #1213).
Fix build failures when UseDeprecatedKeyboardDriver is YES and DoLoadableServer is NO (Bug #1229, Kristian Høgsberg). Fix failure when using DLL loader and LD_BIND_NOW is set (Bug #1212, Adam Jackson).
-rw-r--r--hw/xfree86/loader/loader.c7
1 files changed, 7 insertions, 0 deletions
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);