[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - configure.ac
Caolán McNamara
caolanm at redhat.com
Fri Mar 20 23:33:46 PDT 2015
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eecee2fa0767be84f364a3e320a1863c3620330e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 20 16:48:57 2015 +0000
gdk-pixbuf-xlib-2.0->gdk-pixbuf-2.0
(cherry picked from commit 7fff01817f61a2eb53a5da7248163630a7fb1555)
Conflicts:
configure.ac
Change-Id: Ib58578fd9e093d912294d861094e19151a097534
Reviewed-on: https://gerrit.libreoffice.org/14928
Tested-by: David Tardon <dtardon at redhat.com>
Reviewed-by: David Tardon <dtardon at redhat.com>
diff --git a/configure.ac b/configure.ac
index fd9a74b..ac7e78e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10056,7 +10056,7 @@ ENABLE_SYSTRAY_GTK=""
if test "$test_gtk" = "yes"; then
if test "$ENABLE_GTK" = "TRUE"; then
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gdk-pixbuf-2.0 >= 2.2 ,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
GTK_CFLAGS=$(printf '%s' "$GTK_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages]))
BUILD_TYPE="$BUILD_TYPE GTK"
More information about the Libreoffice-commits
mailing list