Merge lp:~unity-team/nux/nux.libgeis-optional-package into lp:nux

[Jay Taoko]

* Make libgeis package optional in nux-graphics.pc.in. For instance libgeis is not available on Ubuntu Precise.

* Make libgeis package optional in nux-graphics.pc.in. For instance libgeis is not available on Ubuntu Precise.

[lp:~unity-team/nux/nux.libgeis-optional-package]

643. By Jay Taoko on 2012-08-02

* Fix

[Daniel d'Andrada (dandrader)]

You're using two names by accident: GEIS_PKGS and GEIS_PKG
Thus: s/GEIS_PKGS/GEIS_PKG

Other than that it looks ok.

review: Needs Fixing

[lp:~unity-team/nux/nux.libgeis-optional-package]

644. By Jay Taoko on 2012-08-02

* Fix

[Daniel d'Andrada (dandrader)]

looks good.

review: Approve

=== modified file 'NuxGraphics/nux-graphics.pc.in'
--- NuxGraphics/nux-graphics.pc.in	2012-08-01 19:41:37 +0000
+++ NuxGraphics/nux-graphics.pc.in	2012-08-02 19:00:25 +0000
@@ -9,4 +9,4 @@
 Libs: -L${libdir} -lnux-graphics-@NUX_API_VERSION@
 Cflags: -I${includedir}/Nux-@NUX_API_VERSION@
 
-Requires: glib-2.0 cairo libpng gdk-pixbuf-2.0 nux-core-@NUX_API_VERSION@ @GL_PKGS@ xxf86vm xinerama libgeis
+Requires: glib-2.0 cairo libpng gdk-pixbuf-2.0 nux-core-@NUX_API_VERSION@ @GL_PKGS@ xxf86vm xinerama @GEIS_PKGS@

=== modified file 'configure.ac'
--- configure.ac	2012-08-01 19:41:37 +0000
+++ configure.ac	2012-08-02 19:00:25 +0000
@@ -196,6 +196,7 @@
 dnl Enable/disable gestures (geis, from Open Input Framework)
 dnl *********************************************************
 
+GEIS_PKGS="libgeis"
 AC_ARG_ENABLE(gestures,
               AC_HELP_STRING(--disable-gestures, Disables multitouch gestures support (default: auto-detect)),
               [],
@@ -234,12 +235,14 @@
       [
         NUX_GESTURES_SUPPORT="NUX_NO_GESTURES_SUPPORT"
         AM_CONDITIONAL(HAVE_GEIS, false)
+        GEIS_PKGS=""
       ])
 
 AC_SUBST(NUX_GESTURES_SUPPORT)
 
 AC_SUBST(GEIS_CFLAGS)
 AC_SUBST(GEIS_LIBS)
+AC_SUBST(GEIS_PKGS)
 
 dnl ************************************
 dnl Enable/disable tests