Added patch from Bug 351519

to fix directfb backend build

diff --git a/ChangeLog b/ChangeLog
index e71b326f81a5db19a4235a867a1e7a05445ac944..df90d0482c2325c66291cb8b6f45df7c502e5fd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-15  Michael Emmel  <mike.emmel@gmail.com>
+
+       * configure.in  
+       Added cairo flag patch to fix directfb build from bug #351519
+
 2006-08-15  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkevents-quartz.c: (get_event_mask_from_ns_event): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e71b326f81a5db19a4235a867a1e7a05445ac944..df90d0482c2325c66291cb8b6f45df7c502e5fd9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-08-15  Michael Emmel  <mike.emmel@gmail.com>
+
+       * configure.in  
+       Added cairo flag patch to fix directfb build from bug #351519
+
 2006-08-15  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/gdkevents-quartz.c: (get_event_mask_from_ns_event): 

diff --git a/configure.in b/configure.in
index e6d2e8e314a494809976436a868039c7a692e435..09c1479436f81fc321905ed1a6e022b3a066146b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1415,8 +1415,8 @@ if test "x$gdktarget" = "xdirectfb"; then
 
   if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then
       AC_MSG_RESULT(found)
-      GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags directfb` $GDK_EXTRA_CFLAGS"
-      GDK_EXTRA_LIBS="`$PKG_CONFIG --libs directfb` $GDK_EXTRA_LIBS"
+      GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags directfb $cairo_module` $GDK_EXTRA_CFLAGS"
+      GDK_EXTRA_LIBS="`$PKG_CONFIG --libs directfb $cairo_module` $GDK_EXTRA_LIBS"
   else
       AC_MSG_ERROR([
 *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest