diff options
| author | <ssp@aware-of-vacuity.boston.redhat.com> | 2005-05-16 22:35:27 +0000 |
|---|---|---|
| committer | <ssp@aware-of-vacuity.boston.redhat.com> | 2005-05-16 22:35:27 +0000 |
| commit | 23198d2bfbf0049b2630235cd4d4a4ffba7ec6c1 (patch) | |
| tree | f67a3f94e74a581b2fb713f27dbdeece3950e3b7 | |
| parent | 8bd3aea84ce54b8b76a898f3ae00e2b499c14a5e (diff) | |
Make Xdmcp unconditionally required, require various protocol modules.
Mon May 16 17:48:03 2005 Søren Sandmann <sandmann@redhat.com>
Check for kbproto if using XKB.
Require xextproto rather than xextensions
Remove the entries from the xlibs tree, as they are not relevant here.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | nls/Makefile.am | 5 | ||||
| -rw-r--r-- | src/x11_trans.c | 4 | ||||
| -rw-r--r-- | src/xim_trans.c | 4 |
5 files changed, 16 insertions, 13 deletions
@@ -1,3 +1,8 @@ +2005-05-16 <ssp@aware-of-vacuity.boston.redhat.com> + + * configure.ac: Make Xdmcp unconditionally required, require various + protocol modules. + Mon May 16 17:48:03 2005 Søren Sandmann <sandmann@redhat.com> * configure.ac: Check for kbproto if using XKB. diff --git a/configure.ac b/configure.ac index 47e3da9..0acbcbb 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,7 @@ PKG_CHECK_MODULES(BIGREQS, bigreqsproto) AC_SUBST(BIGREQS_CFLAGS) AC_SUBST(BIGREQS_LIBS) -PKG_CHECK_MODULES(X11, xextproto xtrans xau) -PKG_CHECK_MODULES(XDMCP, xdmcp, [xdmauth="yes"], [xdmauth="no"]) +PKG_CHECK_MODULES(X11, xextproto xtrans xau xcmiscproto xdmcp) AC_SUBST(X11_CFLAGS) AC_SUBST(X11_LIBS) @@ -98,19 +97,13 @@ esac AC_SUBST(XTHREADS) AC_SUBST(XUSE_MTSAFE_API) -if test "x$xdmauth" = "xyes"; then -echo checking dmcp AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS]) -fi case x$xdmauth in xyes) - echo setting flags XDMCP_CFLAGS="$XDMCP_CFLAGS -DHASXDMAUTH" ;; xno) - echo unsetting flags - XDMCP_CFLAGS="" XDMCP_LIBS="" ;; esac @@ -181,7 +174,7 @@ fi AM_CONDITIONAL(XKB, [ test x$XKB = xyes ]) if test "$XKB" = yes; then - PKG_CHECK_MODULES(XKBPROTO, kbproto) + PKG_CHECK_MODULES(XKBPROTO, kbproto inputproto) AC_DEFINE(XKB, YES, [Use XKB]) X11_CFLAGS="$X11_CFLAGS $XKBPROTO_CFLAGS" X11_LIBS="$X11_LIBS $XKBPROTO_LIBS" diff --git a/nls/Makefile.am b/nls/Makefile.am index a01b5cd..f0c3eb9 100644 --- a/nls/Makefile.am +++ b/nls/Makefile.am @@ -69,3 +69,8 @@ locale.alias: locale.alias.pre $(CPP) -traditional -DXCOMM='#' - < $< > locale.alias.l1 sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ < locale.alias.l1 > locale.alias + +compose.dir: compose.dir.pre + $(CPP) -traditional -DXCOMM='#' - < $< > compose.dir.l1 + sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ + < compose.dir.l1 > compose.dir diff --git a/src/x11_trans.c b/src/x11_trans.c index d6bf585..fa4d066 100644 --- a/src/x11_trans.c +++ b/src/x11_trans.c @@ -1,5 +1,5 @@ /* - * $Id: x11_trans.c,v 3.3 2003/11/01 00:33:15 anholt Exp $ + * $Id: x11_trans.c,v 1.1 2005/05/13 22:53:43 sandmann Exp $ * * Copyright © 2003 Keith Packard * @@ -28,5 +28,5 @@ #define X11_t #define TRANS_CLIENT -#include <transport.c> +#include <X11/transport.c> diff --git a/src/xim_trans.c b/src/xim_trans.c index 8a9030f..af7f8bb 100644 --- a/src/xim_trans.c +++ b/src/xim_trans.c @@ -1,5 +1,5 @@ /* - * $Id: xim_trans.c,v 3.2 2003/09/26 21:07:29 keithp Exp $ + * $Id: xim_trans.c,v 1.1 2005/05/13 22:53:43 sandmann Exp $ * * Copyright © 2003 Keith Packard * @@ -25,4 +25,4 @@ #define XIM_t #define TRANS_CLIENT -#include <transport.c> +#include <X11/transport.c> |