diff options
| author | Carl Worth <cworth@cworth.org> | 2009-09-16 17:03:30 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2009-09-18 10:05:00 -0700 |
| commit | db4cb300dec74c9198a4f04aafd20042fe2d1fd9 (patch) | |
| tree | 6a36ef4b6fa16e8cc130998ad028009893db3468 | |
| parent | 047a1ebbbcea3ad78a06f0fa8450fa8ba38be43d (diff) | |
| download | xorg-proto-xf86dgaproto-db4cb300dec74c9198a4f04aafd20042fe2d1fd9.tar.gz | |
Change xf86dga.h to only conditionally include server's header file.xf86dgaproto-2.0.99.2
The recent re-addition of the xf86dga.h file introduced an
incompatibility with a recent, but unreleased version of libXxf86dga
which also wanted to install a file of the same name. Instead, we
allow the proto package to own this file, and include the library's
version (now to be named Xxf86dga.h) unless we're building an old
server (indicated by _XF86DGA_SERVER_).
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | xf86dga.h | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d517c3a..8c81de9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([XF86DGAProto], [2.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([XF86DGAProto], [2.0.99.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG @@ -1,3 +1,13 @@ +#ifdef _XF86DGA_SERVER_ + #warning "xf86dga.h is obsolete and may be removed in the future." #warning "include <X11/extensions/xf86dgaconst.h> instead." #include <X11/extensions/xf86dgaconst.h> + +#else + +#warning "xf86dga.h is obsolete and may be removed in the future." +#warning "include <X11/extensions/Xxf86dga.h> instead." +#include <X11/extensions/Xxf86dga.h> + +#endif |