xserver ChangeLog, 3.203, 3.204 Makefile.am, 3.14, 3.15 configure.ac, 3.85, 3.86
Carlos Romero <xserver-commit-u7BhqnqprCWvj1b/[email protected]>
| Newsgroups | gmane.comp.freedesktop.xserver.cvs |
|---|---|
| Message-ID | <[email protected]> |
Committed by: kidcrash Update of /cvs/xserver/xserver In directory pdx:/tmp/cvs-serv31969 Modified Files: ChangeLog Makefile.am configure.ac Log Message: Initial kdrive XKB/XINPUT support, use --enable-xkb --enable-xinput Index: ChangeLog =================================================================== RCS file: /cvs/xserver/xserver/ChangeLog,v retrieving revision 3.203 retrieving revision 3.204 diff -u -d -r3.203 -r3.204 --- ChangeLog 3 Jul 2004 10:23:03 -0000 3.203 +++ ChangeLog 7 Jul 2004 19:21:06 -0000 3.204 @@ -1,3 +1,12 @@ +2004-07-07 Carlos Romero <[email protected]> + * Makefile.am: + * configure.ac: + * hw/kdrive/src/kinput.c: (KdKeybdProc), (KdInitInput): + * os/utils.c: (LogMessage): + * xkb/Makefile.am: + * xkb/xkbInit.c: + Initial kdrive XKB/XINPUT support, use --enable-xkb --enable-xinput + 2004-07-03 Eric Anholt <[email protected]> * hw/kdrive/ati/r128_composite.c: (R128CheckComposite), Index: Makefile.am =================================================================== RCS file: /cvs/xserver/xserver/Makefile.am,v retrieving revision 3.14 retrieving revision 3.15 diff -u -d -r3.14 -r3.15 --- Makefile.am 25 Apr 2004 10:25:39 -0000 3.14 +++ Makefile.am 7 Jul 2004 19:21:06 -0000 3.15 @@ -16,7 +16,7 @@ XI_SUBDIR = Xi endif -if XORGSERVER +if XKB XKB_SUBDIR = xkb endif Index: configure.ac =================================================================== RCS file: /cvs/xserver/xserver/configure.ac,v retrieving revision 3.85 retrieving revision 3.86 diff -u -d -r3.85 -r3.86 --- configure.ac 7 Jun 2004 05:16:26 -0000 3.85 +++ configure.ac 7 Jul 2004 19:21:06 -0000 3.86 @@ -109,6 +109,7 @@ AC_ARG_ENABLE(glx, [ --enable-glx ],[GLX=$enableval],[GLX=no]) AC_ARG_ENABLE(dri, [ --enable-dri ],[DRI=$enableval],[DRI=no]) AC_ARG_ENABLE(xinput, [ --enable-xinput ],[XINPUT=$enableval],[XINPUT=no]) +AC_ARG_ENABLE(xkb, [ --enable-xkb ],[XKB=$enableval],[XKB=no]) AC_ARG_ENABLE(xloadable, [ --enable-xloadable ],[XLOADABLE=$enableval],[XLOADABLE=no]) AC_ARG_ENABLE(xinerama, [ --enable-xinerama ],[XINERAMA=$enableval],[XINERAMA=no]) AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes]) @@ -161,6 +162,8 @@ AM_CONDITIONAL(KDRIVESERVER, [test x$KDRIVESERVER = xyes]) if test "$KDRIVESERVER" = yes; then AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server]) + AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx]) + REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" fi AM_CONDITIONAL(XNESTSERVER, [test x$XNESTSERVER = xyes]) @@ -185,9 +188,10 @@ AC_DEFINE(XORGSERVER,,[Build Xorg server]) AC_DEFINE(XKB,,[Build Xkb]) AC_DEFINE(XINPUT,,[Build XInput]) + AC_DEFINE(XF86DDXACTIONS,,[Build Xorg ddx]) REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" fi -AC_SUBST([XKB]) +#AC_SUBST([XKB]) AM_CONDITIONAL(XGLSERVER, [test x$XGLSERVER = xyes]) if test "$XGLSERVER" = yes; then @@ -222,6 +226,7 @@ AC_DEFINE(XF86DRI,1,[Build DRI extension]) AC_DEFINE(_XF86DRI_SERVER_,1,[XF86DRI internal define]) fi + AM_CONDITIONAL(XINPUT, [test x$XINPUT = xyes]) if test "$XINPUT" = yes; then AC_DEFINE(XINPUT,1,[Support X Input extension]) @@ -229,6 +234,14 @@ EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.a' fi +AM_CONDITIONAL(XKB, [test x$XKB = xyes]) +if test "$XKB" = yes; then + AC_DEFINE(XKB,1,[Support XKB extension]) + EXTENSION_INCS="$EXTENSION_INCS "'-I$(top_srcdir)/xkb' + EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/xkb/libxkb.a' + REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" +fi + AM_CONDITIONAL(XINERAMA, [test x$XINERAMA = xyes]) if test "$XINERAMA" = yes; then AC_DEFINE(XINERAMA,1,[Support Xinerama extension])