Merge lp:~vanvugt/compiz-core/fix-928044 into lp:compiz-core

[Daniel van Vugt]

Use correct library dirs to avoid plugin build failures (LP: #928044)

[Sam Spilsbury (smspillaz)]

This is strange - I added that in order to fix a build failure with c-p-m that I was having. Perhaps something has changed?

review: Approve

[Daniel van Vugt (vanvugt)]

Yes, I think the thing that changed was the introduction of libcompiz_core as a shared library. Because the builds worked perfectly before that.

The compiz.pc.in fix was enough to stop the build failing in 'text'. But then it was still failing in 'mousepoll' because mousepoll had somehow automagically lost the -L${prefix}/usr/lib it gets from compiz.pc and so couldn't find libcompiz_core.

${libdir} is subject to change depending on which package you're building. For plugins, ${libdir} is the plugins directory. So of course, the linker can't find libcompiz_core there. That's why we need to use the unambiguous COMPIZ_LIBDIR instead of libdir.

[Sam Spilsbury (smspillaz)]

Alright, +1

=== modified file 'cmake/CompizPlugin.cmake'
--- cmake/CompizPlugin.cmake	2012-01-23 17:33:54 +0000
+++ cmake/CompizPlugin.cmake	2012-02-07 06:45:22 +0000
@@ -363,9 +363,8 @@
             ${COMPIZ_LINK_DIRS}
             ${${_PLUGIN}_PKG_LIBDIRS}
             ${${_PLUGIN}_LIBDIRS}
+            ${COMPIZ_LIBDIR}
             ${PLUGIN_LIBDIR}
-	    ${libdir}
-            ${COMPIZ_LIBDIR}/compiz
 	    ${${_PLUGIN}_MOD_LIBRARY_DIRS}
             ${SYSTEM_LINK_DIRS}
 	)

=== modified file 'compiz.pc.in'
--- compiz.pc.in	2008-10-06 17:11:30 +0000
+++ compiz.pc.in	2012-02-07 06:45:22 +0000
@@ -8,5 +8,5 @@
 Version: @VERSION@
 
 Requires: @COMPIZ_REQUIRES@
-Libs:
+Libs: -L${libdir} -lcompiz_core
 Cflags: @COMPIZ_CFLAGS@ -I${includedir}/compiz