2005-10-21 Matthew Allum <[email protected]>

        * configure.ac:
        * src/Makefile.am:
        * src/matchbox-keyboard-ui-cairo-backend.c:
        * src/matchbox-keyboard-ui-cairo-backend.h:
        * src/matchbox-keyboard-ui-xft-backend.c:
        * src/matchbox-keyboard-ui-xft-backend.h:
        * src/matchbox-keyboard-ui.c: (mb_kbd_ui_resources_create):
        * src/matchbox-keyboard.h:
        Break out rendering backend and add optional initial cairo
        based rendering backend ( based on patch from Tuukka Pasanen )

        * layouts/Makefile.am:
        * layouts/keyboard-fi.xml:
        Add finish layout via  Tuukka Pasanen

git-svn-id: https://svn.o-hand.com/repos/matchbox/trunk/matchbox-keyboard@1265 b067294f-1dea-0310-9683-c47a78595994

ChangeLog

@@ -1,3 +1,20 @@
+2005-10-21  Matthew Allum  <[email protected]>
+
+	* configure.ac:
+	* src/Makefile.am:
+	* src/matchbox-keyboard-ui-cairo-backend.c:
+	* src/matchbox-keyboard-ui-cairo-backend.h:
+	* src/matchbox-keyboard-ui-xft-backend.c:
+	* src/matchbox-keyboard-ui-xft-backend.h:
+	* src/matchbox-keyboard-ui.c: (mb_kbd_ui_resources_create):
+	* src/matchbox-keyboard.h:
+	Break out rendering backend and add optional initial cairo
+	based rendering backend ( based on patch from Tuukka Pasanen )
+
+	* layouts/Makefile.am:
+	* layouts/keyboard-fi.xml:
+	Add finish layout via  Tuukka Pasanen
+
 2005-10-10  Matthew Allum  <[email protected]>
 
 	* src/matchbox-keyboard-ui.c: (mb_kbd_ui_event_loop):

configure.ac

@@ -25,6 +25,15 @@ AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
 AC_FUNC_STAT
 
+AC_ARG_ENABLE(debug,
+  [  --enable-debug    enable debug ( verbose ) build],
+     enable_debug=$enableval, enable_debug=no )
+
+AC_ARG_ENABLE(cairo,
+  [  --disable-cairo            disable Cairo support [default=auto]],
+   		enable_cairo=$enableval, 
+		enable_cairo=yes)	    
+
 AC_ARG_ENABLE(debug,
   [  --enable-debug    enable debug ( verbose ) build],
      enable_debug=$enableval, enable_debug=no )
@@ -37,9 +46,20 @@ AC_ARG_WITH(expat-lib,
   [  --with-expat-lib=DIR          Use Expat library in DIR], 
 	   expat_lib=$withval, expat_lib=yes)
 
+PKG_CHECK_MODULES(FAKEKEY, libfakekey,,
+	         AC_MSG_ERROR([*** You need to install libfakekey from MB SVN  ***]))
+
+if test x$enable_cairo = xyes; then
+   PKG_CHECK_MODULES(CAIRO, cairo,, [enable_cairo="no"])
+fi
+
+if test x$enable_cairo = xno; then
+PKG_CHECK_MODULES(XFT, xft,,
+	         AC_MSG_ERROR([*** Required xft Librarys not found ***]))
+fi
+
+AM_CONDITIONAL(WANT_CAIRO, test x$enable_cairo = xyes)
 
-PKG_CHECK_MODULES(LIBMB, xft libfakekey,,
-	         AC_MSG_ERROR([*** Required Librarys not found ***]))
 
 dnl ------ Expat ------------------------------------------------------------
 
@@ -140,14 +160,17 @@ dnl ------ GCC flags --------------------------------------------------------
 
 if test "x$GCC" = "xyes"; then
         GCC_WARNINGS="-g -Wall -fno-strict-aliasing"
-        LIBMB_CFLAGS="$GCC_WARNINGS $LIBMB_CFLAGS"
+        FAKEKEY_CFLAGS="$GCC_WARNINGS $FAKEKEY_CFLAGS"
 fi
 
 
 dnl ------ Substitute in found libs, clags to Makefiles etc -----------------
 
-AC_SUBST(LIBMB_CFLAGS)
-AC_SUBST(LIBMB_LIBS)
+AC_SUBST(FAKEKEY_CFLAGS)
+AC_SUBST(FAKEKEY_LIBS)
+
+AC_SUBST(XFT_CFLAGS)
+AC_SUBST(XFT_LIBS)
 
 AC_SUBST(EXPAT_LIBS)
 AC_SUBST(EXPAT_CFLAGS)

layouts/Makefile.am

@@ -1,3 +1,3 @@
 keyboardsdir = $(datadir)/matchbox-keyboard
 keyboards_DATA = keyboard.xml keyboard-extended.xml keyboard-dvorak.xml \
-		 keyboard-ru.xml
+		 keyboard-ru.xml keyboard-fi.xml