summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--configure.ac2
-rw-r--r--hw/xfree86/dixmods/extmod/Makefile.am2
-rw-r--r--include/dix-config.h.in2
-rw-r--r--include/xorg-server.h.in2
5 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c3091bf7..6b59cc783 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
+ * include/dix-config.h.in:
+ * include/xorg-server.h.in:
+ Fix typo to enable DGA support.
+
+ * hw/xfree86/dixmods/extmod/Makefile.am:
+ EXTMODULE is required to build DGA support into extmod.
+
+2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
Update package version number for X11R7 RC2 release.
Update release string to 6.99.99.902 (i.e., 7.0 RC2).
diff --git a/configure.ac b/configure.ac
index bfa2d7104..24fb8e6f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1152,7 +1152,7 @@ AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir])
AC_SUBST(XKM_OUTPUT_DIR)
dnl and the rest of these are generic, so they're in config.h
-AC_DEFINE(XFree86XDGA, 1, [Build XDGA support])
+AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
AC_DEFINE(XF86BIGFONT, 1, [Build XFree86 BigFont extension])
AC_DEFINE(XResExtension, 1, [Build XRes extension])
AC_DEFINE(DPMSExtension, 1, [Build DPMS extension])
diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
index fbb07732a..9f3c9ffc8 100644
--- a/hw/xfree86/dixmods/extmod/Makefile.am
+++ b/hw/xfree86/dixmods/extmod/Makefile.am
@@ -10,7 +10,7 @@ if XV
XV_SRCS = xvmod.c xvmodproc.h
endif
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ -DEXTMODULE
INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/afb \
-I$(top_srcdir)/mfb \
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index b8db9d40a..2764e9b6f 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -318,7 +318,7 @@
#undef XFIXES
/* Build XDGA support */
-#undef XFree86XDGA
+#undef XFreeXDGA
/* Support Xinerama extension */
#undef XINERAMA
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 332186875..53b0f335c 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -146,7 +146,7 @@
#undef XFree86Server
/* Build XDGA support */
-#undef XFree86XDGA
+#undef XFreeXDGA
/* Support Xinerama extension */
#undef XINERAMA