diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-06-19 17:20:52 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-06-19 17:20:52 +0930 |
| commit | 1f97a7647606226cde61d6ad7a94f2b0b571a06c (patch) | |
| tree | 63959752648b4f3bcfe4ac271d0a714dfcd93280 /randr | |
| parent | 5dee64fc99f34e091abce65d47c4b6f026ab4849 (diff) | |
| parent | 2e7fef7d0837939e822c40b6ac77e7f0e66d57bd (diff) | |
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
hw/xfree86/common/xf86Xinput.c
hw/xfree86/loader/xf86sym.c
mi/mieq.c
Diffstat (limited to 'randr')
| -rw-r--r-- | randr/Makefile.am | 10 | ||||
| -rw-r--r-- | randr/randr.c | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/randr/Makefile.am b/randr/Makefile.am index 9bf0e6531..20b0f72e0 100644 --- a/randr/Makefile.am +++ b/randr/Makefile.am @@ -2,6 +2,8 @@ noinst_LTLIBRARIES = librandr.la AM_CFLAGS = $(DIX_CFLAGS) +XINERAMA_SRCS = rrxinerama.c + if XORG sdk_HEADERS = randrstr.h endif @@ -18,5 +20,9 @@ librandr_la_SOURCES = \ rrpointer.c \ rrproperty.c \ rrscreen.c \ - rrsdispatch.c \ - rrxinerama.c + rrsdispatch.c + +if XINERAMA +librandr_la_SOURCES += ${XINERAMA_SRCS} +endif + diff --git a/randr/randr.c b/randr/randr.c index 4dd0ee5b4..958f9c192 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -358,8 +358,9 @@ RRExtensionInit (void) SRRScreenChangeNotifyEvent; EventSwapVector[RREventBase + RRNotify] = (EventSwapPtr) SRRNotifyEvent; - +#ifdef PANORAMIX RRXineramaExtensionInit(); +#endif } static int |