diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2006-03-15 21:25:38 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2006-03-15 21:25:38 +0000 |
| commit | 6fe377af5a82deb6f8b0f3b75414335e7845caac (patch) | |
| tree | 5d5e3d284e3d9f1c7765279646e642dd1c70c351 | |
| parent | 21f7f2fb113ee4f9cd011c3cc2d45d43bbdd35fa (diff) | |
- OpenBSD needs -Wl,-export-dynamic to export symbols from main executable
to modules.
- Probe for OpenBSD aperture driver and define HAS_APERTURE_DRV
accordingly.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | include/xorg-config.h.in | 3 |
3 files changed, 22 insertions, 0 deletions
@@ -1,3 +1,12 @@ +2006-03-15 Matthieu Herrb <matthieu.herrb@laas.fr> + + * configure.ac + * include/xorg-config.h.in + - OpenBSD needs -Wl,-export-dynamic to export symbols from main + executable to modules. + - Probe for OpenBSD aperture driver and define HAS_APERTURE_DRV + accordingly. + 2006-03-15 Felix Kuehling <fkuehlin@ati.com> * hw/xfree86/x86emu/ops2.c: (x86emuOp2_bts_R): diff --git a/configure.ac b/configure.ac index 1cedcfa55..9a274a223 100644 --- a/configure.ac +++ b/configure.ac @@ -158,6 +158,11 @@ if test "x$ac_cv_sysv_ipc" = xyes; then AC_DEFINE(HAVE_SYSV_IPC, 1, [Define to 1 if SYSV IPC is available]) fi +dnl OpenBSD /dev/xf86 aperture driver +if test -c /dev/xf86 ; then + AC_DEFINE(HAS_APERTURE_DRV, 1, [System has /dev/xf86 aperture driver]) +fi + dnl glibc backtrace support check (hw/xfree86/common/xf86Events.c) AC_CHECK_HEADER([execinfo.h],[ AC_CHECK_LIB(c, backtrace, [ @@ -1190,6 +1195,11 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then XSERVER_CFLAGS="$GCC_WARNINGS $XSERVER_CFLAGS" LD_EXPORT_SYMBOLS_FLAG="-rdynamic" fi + case $host_os in + openbsd*) + LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic" + ;; + esac AC_SUBST([XORG_CFLAGS]) AC_SUBST([LD_EXPORT_SYMBOLS_FLAG]) diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in index f74850182..9833fd4bb 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in @@ -106,6 +106,9 @@ /* System has wscons console */ #undef WSCONS_SUPPORT +/* System has /dev/xf86 aperture driver */ +#undef HAS_APERTURE_DRV + /* Has backtrace support */ #undef HAVE_BACKTRACE |