diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-13 22:59:39 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-13 22:59:39 +0000 |
| commit | f4626bb72b9955846abee018ae31c1aeb51b8dbf (patch) | |
| tree | 61248946dea4b39670ffc99878daf33865f83617 | |
| parent | 4f38526566dbcc296d124bb852adfa30ac4d927e (diff) | |
dlloader is the default in 6.9, but the loader doesn't get told to prefer
dlloader modules unless you -DDLOPEN_HACK.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | include/xorg-config.h.in | 3 | ||||
| -rw-r--r-- | include/xorg-server.h.in | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index a71ff0908..141fe4d43 100644 --- a/configure.ac +++ b/configure.ac @@ -653,6 +653,9 @@ AC_DEFINE(NEED_XF86_TYPES,1,[Need XFree86 typedefs]) AC_DEFINE(NEED_XF86_PROTOTYPES,1,[Need XFree86 helper functions]) AC_DEFINE(__XSERVERNAME__,"Xorg",[Name of X server]) AC_DEFINE(__XKBDEFRULES__,"xorg",[Default XKB rules]) +# XXX HACK! if anyone cares about elfloader in 7.0 you need to +# XXX do something smarter here. +AC_DEFINE(DLOPEN_HACK,1,[Prefer dlloader modules to elfloader]) AC_DEFINE(DLOPEN_SUPPORT,1,[Use libdl-based loader]) AC_DEFINE(DRIVERS,{},[Built-in output drivers]) AC_DEFINE(IDRIVERS,{},[Built-in input drivers]) diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in index 419277a5f..77bc5566e 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in @@ -38,6 +38,9 @@ /* URL to go to for support. */ #undef __VENDORDWEBSUPPORT__ +/* Prefer dlloader modules to elfloader */ +#undef DLOPEN_HACK + /* Use libdl-based loader. */ #undef DLOPEN_SUPPORT diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index ba7a6093d..7d476d431 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -25,6 +25,9 @@ /* Use OsVendorInit */ #undef DDXOSINIT +/* Prefer dlloader modules to elfloader */ +#undef DLOPEN_HACK + /* Building with libdl */ #undef DLOPEN_SUPPORT |