[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xlibs-commit
Subject:    X11 ChangeLog,1.66,1.67 configure.ac,1.31,1.32
From:       Josh Triplett <xlibs-commit () pdx ! freedesktop ! org>
Date:       2005-02-12 7:46:49
Message-ID: 20050212074649.DA63C9E79F () gabe ! freedesktop ! org
[Download RAW message or body]

Committed by: josh

Update of /cvs/xlibs/X11
In directory gabe:/tmp/cvs-serv6930

Modified Files:
	ChangeLog configure.ac 
Log Message:
* src/xcl/proto.c: Add pregenerated output file based on last M4-based XCB.

* configure.ac, src/Makefile.am: Don't try to regenerate the output file.

* src/xcl/.cvsignore: Remove; only contained proto.c, which should now not be
ignored.



Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/X11/ChangeLog,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- ChangeLog	12 Feb 2005 07:36:16 -0000	1.66
+++ ChangeLog	12 Feb 2005 07:46:47 -0000	1.67
@@ -1,5 +1,16 @@
 2005-02-11  Josh Triplett  <josh@freedesktop.org>
 
+	* src/xcl/proto.c: Add pregenerated output file based on last
+	M4-based XCB.
+
+	* configure.ac, src/Makefile.am: Don't try to regenerate the
+	output file.
+
+	* src/xcl/.cvsignore: Remove; only contained proto.c, which should
+	now not be ignored.
+
+2005-02-11  Josh Triplett  <josh@freedesktop.org>
+
 	* man/.cvsignore: add man/Makefile.in and man/Makefile.
 
 2005-02-09  Owen Taylor  <otaylor@redhat.com>

Index: configure.ac
===================================================================
RCS file: /cvs/xlibs/X11/configure.ac,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- configure.ac	23 Nov 2004 01:48:35 -0000	1.31
+++ configure.ac	12 Feb 2005 07:46:47 -0000	1.32
@@ -36,24 +36,11 @@
 	AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation])
 	;;
 *)
-	AC_CHECK_PROGS(M4, m4)
-	PKG_CHECK_MODULES(XCBPROTO, xcb-proto)
 	PKG_CHECK_MODULES(X11, xextensions xtrans xcb)
 	AC_DEFINE(USE_XCB, 1, [Use XCB for low-level protocol implementation])
-
-	# Produce an XCB proto description search path
-	for flag in $XCBPROTO_CFLAGS; do
-		case "$flag" in
-		-I*)
-			XCBPROTO_VPATH="$XCBPROTO_VPATH `echo "$flag" | sed 's/^-I//'`"
-		;;
-		esac
-	done
 	;;
 esac
 
-AC_SUBST(XCBPROTO_VPATH)
-AC_SUBST(XCBPROTO_CFLAGS)
 AC_SUBST(X11_CFLAGS)
 AC_SUBST(X11_LIBS)
 AC_SUBST(XDMCP_CFLAGS)


[prev in list] [next in list] [prev in thread] [next in thread]