diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-25 09:13:44 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-07-25 09:13:44 +0200 |
| commit | 441c122606e3a921a947f4126a414c9974d64533 (patch) | |
| tree | a6ad7f810150142b2d0f2a51ee49a1ddbff285a5 /package/libgtk2 | |
| parent | 8c1fc169ab7330ddaed774d1e780b9d81edb4f25 (diff) | |
| parent | 74ecbaa23da486182a1bb20b43361aaf2a478877 (diff) | |
Merge branch 'xorg' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/libgtk2')
| -rw-r--r-- | package/libgtk2/Config.in | 2 | ||||
| -rw-r--r-- | package/libgtk2/libgtk2.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index 19809f26e..5c0482d61 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_CAIRO_PDF select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB + depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB help The GTK+ version 2 graphical user interface library diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index 7db0067bb..3b85f6346 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -85,13 +85,13 @@ ifeq ($(BR2_PACKAGE_DIRECTFB),y) LIBGTK2_DEPENDENCIES += directfb endif -ifneq ($(BR2_PACKAGE_XSERVER_none),y) +ifeq ($(BR2_PACKAGE_XORG7),y) LIBGTK2_CONF_OPT += \ --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib \ --with-gdktarget=x11 - LIBGTK2_DEPENDENCIES += xlib_libXcomposite $(XSERVER) + LIBGTK2_DEPENDENCIES += xlib_libXcomposite xserver_xorg-server else LIBGTK2_CONF_OPT += --without-x endif |