Merge lp:~vanvugt/compiz/fix-1023742 into lp:compiz/0.9.8

[Daniel van Vugt]

Avoid random build failures "_intltool_update-NOTFOUND: not found"
by verifying intltool-update exists. If not, then fail cmake more cleanly
with a nice error message telling the user how to install it.
(LP: #1023742)

The truly weird part is that I've been building compiz successfully for a
long time without intltool-update installed. However we have some broken
cmake dependencies somewhere which *sometimes* make that a problem (like
with make -j2), but mostly not a problem (like make -j1).

Avoid random build failures "_intltool_update-NOTFOUND: not found"
by verifying intltool-update exists. If not, then fail cmake more cleanly
with a nice error message telling the user how to install it.
(LP: #1023742)

The truly weird part is that I've been building compiz successfully for a
long time without intltool-update installed. However we have some broken
cmake dependencies somewhere which *sometimes* make that a problem (like
with make -j2), but mostly not a problem (like make -j1).

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3285
http://jenkins.qa.ubuntu.com/job/compiz-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=amd64/10/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=i386/10/console

review: Approve (continuous-integration)

[Sam Spilsbury (smspillaz)]

This is also good, although I'm not sure about the usage of SEND_ERROR here

(See: http://cmake.org/cmake/help/v2.8.8/cmake.html#command:message)

SEND_ERROR will prevent generation but not abort configuration - I think in the case where intltool-update is not found we should just not generate translations and use message (WARNING) for that. If we should enforce the generation of translations, then just put a reason why and mark this branch as approved.

[Daniel van Vugt (vanvugt)]

I have tested it. If the file doesn't exist then cmake will complete, but says there were errors and won't give you a Makefile. I think that's preferable to aborting cmake immediately. It's still an error and still prevents you from building.

This bug is actually caused by a race of some sort. Because under normal circumstances (make -j1) I can build successfully without intltool* installed.

[Sam Spilsbury (smspillaz)]

Okay then.

review: Approve

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2012-05-24 00:55:17 +0000
+++ po/CMakeLists.txt	2012-07-12 07:39:57 +0000
@@ -1,7 +1,9 @@
 project (po)
 
 find_program (_intltool_update intltool-update)
-mark_as_advanced (intltool_update)
+if (NOT EXISTS "${_intltool_update}")
+    message (SEND_ERROR "Missing intltool-update (try: sudo apt-get install intltool)")
+endif ()
 
 find_program (_xgettext xgettext)
 mark_as_advanced (_xgettext)