diff --git a/ChangeLog b/ChangeLog index 49ab1aa58..4eac95e38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-11-08 Kevin E. Martin + + * hw/xfree86/os-support/Makefile.am: + * hw/xfree86/os-support/sco/Makefile.am: + * hw/xfree86/os-support/usl/Makefile.am: + Add newly checked in files to Xorg server build. + + * configure.ac: + * include/dix-config.h.in: + Fix release date. + Enable DGA extension by default. + 2005-11-03 Kevin E. Martin * configure.ac: diff --git a/configure.ac b/configure.ac index 73d0283f4..4dacd7599 100644 --- a/configure.ac +++ b/configure.ac @@ -275,6 +275,7 @@ DEFAULT_VERSION_MAJOR=6 DEFAULT_VERSION_MINOR=99 DEFAULT_VERSION_PATCH=99 DEFAULT_VERSION_SNAP=901 +DEFAULT_RELEASE_DATE="09 November 2005" DEFAULT_VENDOR_WEB="http://wiki.x.org" m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) @@ -313,6 +314,10 @@ AC_ARG_WITH(release-snap, AS_HELP_STRING([--with-release-snap=SNAP], [Release snap number reported by the server]), [ VERSION_SNAP="$withval" ], [ VERSION_SNAP="$DEFAULT_VERSION_SNAP" ]) +AC_ARG_WITH(release-date, AS_HELP_STRING([--with-release-date=DATE], + [Release date reported by the server]), + [ RELEASE_DATE="$withval" ], + [ RELEASE_DATE="$DEFAULT_RELEASE_DATE" ]) AC_ARG_WITH(vendor-web, AS_HELP_STRING([--with-vendor-web=URL], [Vendor web address reported by the server]), [ VENDOR_WEB="$withval" ], @@ -363,7 +368,7 @@ AC_ARG_ENABLE(xres, AS_HELP_STRING([--disable-xres], [Build XRes exten AC_ARG_ENABLE(xtrap, AS_HELP_STRING([--enable-xtrap], [Build XTrap extension (default: disabled)]), [XTRAP=$enableval], [XTRAP=no]) AC_ARG_ENABLE(record, AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes]) AC_ARG_ENABLE(xv, AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes]) -AC_ARG_ENABLE(dga, AS_HELP_STRING([--enable-dga], [Build DGA extension (default: disabled)]), [DGA=$enableval], [DGA=no]) +AC_ARG_ENABLE(dga, AS_HELP_STRING([--disable-dga], [Build DGA extension (default: enabled)]), [DGA=$enableval], [DGA=yes]) AC_ARG_ENABLE(screensaver, AS_HELP_STRING([--disable-screensaver], [Build ScreenSaver extension (default: enabled)]), [SCREENSAVER=$enableval], [SCREENSAVER=yes]) AC_ARG_ENABLE(xdmcp, AS_HELP_STRING([--disable-xdmcp], [Build XDMCP extension (default: auto)]), [XDMCP=$enableval], [XDMCP=auto]) AC_ARG_ENABLE(xdm-auth-1, AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto]) @@ -686,13 +691,26 @@ if test "x$USE_RGB_BUILTIN" = xyes; then fi VENDOR_RELEASE="((($VERSION_MAJOR) * 10000000) + (($VERSION_MINOR) * 100000) + (($VERSION_PATCH) * 1000) + $VERSION_SNAP)" -VENDOR_MAN_VERSION="Version ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SNAP}" + +if test $VERSION_SNAP = "0"; then + if test $VERSION_PATCH = "0"; then + VENDOR_VERSION_STRING="${VERSION_MAJOR}.${VERSION_MINOR}" + else + VENDOR_VERSION_STRING="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" + fi +else + VENDOR_VERSION_STRING="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SNAP}" +fi + +VENDOR_RELEASE_STRING="Release ${VENDOR_VERSION_STRING}" +VENDOR_MAN_VERSION="Version ${VENDOR_VERSION_STRING}" AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path]) AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path]) AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name]) AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_STRING_SHORT"], [Short vendor name]) -AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE"], [Vendor release]) +AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE_STRING"], [Vendor release]) +AC_DEFINE_UNQUOTED(XORG_DATE, ["$RELEASE_DATE"], [Vendor release]) AC_DEFINE_UNQUOTED(XORG_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version]) AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address]) AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name]) @@ -1296,6 +1314,7 @@ hw/xfree86/os-support/lynxos/Makefile hw/xfree86/os-support/sco/Makefile hw/xfree86/os-support/solaris/Makefile hw/xfree86/os-support/sysv/Makefile +hw/xfree86/os-support/usl/Makefile hw/xfree86/parser/Makefile hw/xfree86/rac/Makefile hw/xfree86/ramdac/Makefile diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am index d4406ef87..917b2cbc1 100644 --- a/hw/xfree86/os-support/Makefile.am +++ b/hw/xfree86/os-support/Makefile.am @@ -3,7 +3,7 @@ DRI_SUBDIRS=drm endif SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS) -DIST_SUBDIRS = bsd bus drm misc linux lynxos solaris sysv sco +DIST_SUBDIRS = bsd bus drm misc linux lynxos solaris sysv sco usl sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h xf86drm.h \ xf86drmCompat.h assyntax.h xf86OSKbd.h xf86OSmouse.h diff --git a/hw/xfree86/os-support/sco/Makefile.am b/hw/xfree86/os-support/sco/Makefile.am index c7f3175b8..1271c9d34 100644 --- a/hw/xfree86/os-support/sco/Makefile.am +++ b/hw/xfree86/os-support/sco/Makefile.am @@ -1 +1,10 @@ -EXTRA_DIST = sco_init.c sco_io.c sco_iop.c sco_mouse.c sco_video.c VTsw_sco.c +EXTRA_DIST = \ + VTsw_sco.c \ + sco_KbdMap.c \ + sco_init.c \ + sco_io.c \ + sco_iop.c \ + sco_kbd.c \ + sco_kbd.h \ + sco_mouse.c \ + sco_video.c diff --git a/hw/xfree86/os-support/usl/Makefile.am b/hw/xfree86/os-support/usl/Makefile.am new file mode 100644 index 000000000..5143b243c --- /dev/null +++ b/hw/xfree86/os-support/usl/Makefile.am @@ -0,0 +1,12 @@ +EXTRA_DIST = \ + usl_init.c \ + usl_io.c \ + usl_iop.c \ + usl_kbd.c \ + usl_kbd.h \ + usl_KbdMap.c \ + usl_mouse.c \ + usl_video.c \ + usl_vtsw.c \ + usl_xqueue.c \ + usl_xqueue.h diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 4f4cae8da..b8db9d40a 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -341,6 +341,9 @@ /* Current Xorg version */ #undef XORG_VERSION_CURRENT +/* Xorg release date */ +#undef XORG_DATE + /* Build XRes extension */ #undef XResExtension