From 9657e0e9def47dba5b0bfa7461874362712a07bb Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed, 24 Aug 2005 15:18:06 +0000
Subject: [PATCH] Don't try to build dmx/input/lnx-*.c if <linux/keyboard.h>
 isn't found     Don't try to build dmx/input/usb-*.c if <linux/input.h> isn't
 found Replace -rdynamic with $(LD_EXPORT_SYMBOLS_FLAG) for compatibility with
     compilers other than gcc

---
 ChangeLog                | 11 +++++++++++
 configure.ac             | 10 ++++++++++
 hw/dmx/Makefile.am       |  2 +-
 hw/dmx/input/Makefile.am |  4 ++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5b52df1f4..573658985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-08-24  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* configure.ac: 
+	* hw/dmx/input/Makefile.am:
+	Don't try to build dmx/input/lnx-*.c if <linux/keyboard.h> isn't found
+	Don't try to build dmx/input/usb-*.c if <linux/input.h> isn't found
+
+	* hw/dmx/Makefile.am: 
+	Replace -rdynamic with $(LD_EXPORT_SYMBOLS_FLAG) for compatibility
+	with compilers other than gcc
+	
 2005-08-22  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 0a0b1a2ba..ae0a95ea2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -523,6 +523,16 @@ if test "x$DMX" = xyes; then
 	DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
 	XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $OS_LIB $MIEXT_SHADOW_LIB"
 	AC_SUBST([XDMX_LIBS])
+
+dnl USB sources in DMX require <linux/input.h>
+	AC_CHECK_HEADER([linux/input.h], HAVE_LINUX_INPUT_H="yes",
+			HAVE_LINUX_INPUT_H="no")
+	AM_CONDITIONAL([DMX_BUILD_USB],[test "x$HAVE_LINUX_INPUT_H" = xyes])
+
+dnl Linux sources in DMX require <linux/keyboard.h>
+	AC_CHECK_HEADER([linux/keyboard.h], HAVE_LINUX_KEYBOARD_H="yes",
+			HAVE_LINUX_KEYBOARD_H="no")
+	AM_CONDITIONAL([DMX_BUILD_LNX],[test "x$HAVE_LINUX_KEYBOARD_H" = xyes])
 fi
 
 
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
index 7a3116902..046580567 100644
--- a/hw/dmx/Makefile.am
+++ b/hw/dmx/Makefile.am
@@ -67,7 +67,7 @@ Xdmx_SOURCES = dmx.c \
 #Xdmx_SOURCES += fakecw.c
 #endif
 
-Xdmx_LDFLAGS = -rdynamic
+Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 Xdmx_LDADD = $(XORG_CORE_LIBS) \
              $(XDMX_LIBS) \
              $(GLX_LIBS) \
diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am
index 7568f19f3..1db9872fc 100644
--- a/hw/dmx/input/Makefile.am
+++ b/hw/dmx/input/Makefile.am
@@ -1,12 +1,15 @@
 noinst_LIBRARIES = libdmxinput.a
 
+if DMX_BUILD_LNX
 RAWSRCS = lnx-keyboard.c \
           lnx-keyboard.h \
           lnx-ms.c \
           lnx-ms.h \
           lnx-ps2.c \
           lnx-ps2.h
+endif
 
+if DMX_BUILD_USB
 USBSRCS = usb-keyboard.c \
           usb-keyboard.h \
           usb-mouse.c \
@@ -16,6 +19,7 @@ USBSRCS = usb-keyboard.c \
           usb-common.c \
           usb-common.h \
           usb-private.h
+endif
 
 DRVSRCS = dmxdummy.c \
           dmxdummy.h \