summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael David Emmel <memmel@src.gnome.org>2006-08-15 23:30:08 +0000
committerMichael David Emmel <memmel@src.gnome.org>2006-08-15 23:30:08 +0000
commit17e10a1e24e1efa1e5be6b10f2809b85eec7b712 (patch)
tree732448977ecac183223018594ea31fa0d547c46f
parentb5586c53e8bc3a4767b6966fec935bcc811a11f1 (diff)
downloadgtk+-17e10a1e24e1efa1e5be6b10f2809b85eec7b712.tar.gz
Added patch from Bug 351519
to fix directfb backend build
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--configure.in4
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e71b326f81..df90d0482c 100644
--- 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 e71b326f81..df90d0482c 100644
--- 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 e6d2e8e314..09c1479436 100644
--- 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