[Xcb-commit] 2 commits - configure.ac tools

[Jamey Sharp]

 configure.ac      |    2 +-
 tools/api_conv.pl |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
diff-tree d04e7777d3547de2cece0734c0b9be49d3ddb88c (from 0bccf7d2eed45ba15a012d090b9b950075e75803)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Mon Sep 25 04:14:26 2006 -0700

    Ensure api_conv.pl is idempotent on names of constants: XCB_[A-Z0-9_]+.

diff --git a/tools/api_conv.pl b/tools/api_conv.pl
index 7e26145..003a893 100755
--- a/tools/api_conv.pl
+++ b/tools/api_conv.pl
@@ -62,7 +62,7 @@ sub convert($$)
 	return "uint$1_t" if /^CARD(8|16|32)$/;
 	return "int$1_t" if /^INT(8|16|32)$/;
 	return "uint8_t" if $_ eq 'BOOL' or $_ eq 'BYTE';
-	return $_ if /^[A-Z]*_[A-Z_]*$/ or !/^XCB(.+)/;
+	return $_ if /^[A-Z0-9]*_[A-Z0-9_]*$/ or !/^XCB(.+)/;
 	my $const = defined $::const{$_};
 	$_ = $1;
 
diff-tree 0bccf7d2eed45ba15a012d090b9b950075e75803 (from 9100981d359f6366ab92b456e6069bac89afeb15)
Author: Jamey Sharp <jamey at minilop.net>
Date:   Mon Sep 25 04:03:01 2006 -0700

    Move header files to $includedir/xcb (generally $prefix/include/xcb).

diff --git a/configure.ac b/configure.ac
index ff91834..afcdc8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ AC_HEADER_STDC
 AC_SEARCH_LIBS(gethostbyname, nsl)
 AC_SEARCH_LIBS(connect, socket)
 
-xcbincludedir='${includedir}/X11/XCB'
+xcbincludedir='${includedir}/xcb'
 AC_SUBST(xcbincludedir)
 
 AC_ARG_WITH(opt,
diff --git a/tools/api_conv.pl b/tools/api_conv.pl
index 2b0fa9f..7e26145 100755
--- a/tools/api_conv.pl
+++ b/tools/api_conv.pl
@@ -93,4 +93,5 @@ sub convert($$)
 	return "xcb" . $_;
 }
 
+s/^(\s*#\s*include\s*<)X11\/XCB\//$1xcb\//;
 s/([_A-Za-z][_A-Za-z0-9]*)([ \t]*\()?/convert($1, defined $2) . ($2 or "")/eg;