Merge lp:~oif-team/geis/lp_661946 into lp:geis

[Stephen M. Webb]

Added a configury check for the XCB prototype generator library package xcb-proto version 1.6 or later (LP: #661946).

[Chase Douglas (chasedouglas)]

The bug report should be mentioned in the changelog as well (LP: 661946). This will help people understand why the change was made by just browsing the commit history. It will also automatically mark the bug as "Fix Committed".

I know it's nit picky, but I think we should get into the habit of doing these things. Once it's ingrained in our workflow, things will be smoother.

Code wise, I think the "AC_MSG_ERROR([XCB code generation libraries not found])" is superfluous. If the package isn't found, an error message will be printed by default and the configure script will bail. All that should be needed is "PKG_CHECK_MODULES([XCB_PROTO], [xcb-proto >= 1.6])"

review: Needs Fixing

[Stephen M. Webb (bregma)]

It took me a while to figure out that by "changelog" you mean "bzr commit message".

[Chase Douglas (chasedouglas)]

Looks good to me!

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2010-10-14 17:14:40 +0000
+++ ChangeLog	2010-10-18 14:22:41 +0000
@@ -1,3 +1,9 @@
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added configury check for xcb-proto package >= 1.6 (LP: #661946).
+
+  * configure.ac: added PKG_CHECK_MODULES for xcb-proto >= 1.6
+
 2010-10-14  Stephen M. Webb  <[e-mail]>
 
   Release version 1.0.13.

=== modified file 'configure.ac'
--- configure.ac	2010-10-14 17:14:40 +0000
+++ configure.ac	2010-10-18 14:22:41 +0000
@@ -30,6 +30,7 @@
 		  AC_MSG_ERROR([XI2 development libraries not found]))
 
 # XCB code generation configuration
+PKG_CHECK_MODULES([XCB_PROTO], [xcb-proto >= 1.6])
 AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
 XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
 AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR)