andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't try to build dmx/input/lnx-*.c if <linux/keyboard.h> isn't found

Browse Source 
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
This commit is contained in:
Alan Coopersmith 2005-08-24 15:18:06 +00:00
parent 825a95a1fa
commit 9657e0e9de
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -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:

10
configure.ac
View File

@ -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

2
hw/dmx/Makefile.am
View File

@ -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) \

4
hw/dmx/input/Makefile.am
View File

@ -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 \