summaryrefslogtreecommitdiffstats
path: root/package/libgtk2/libgtk2.mk
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-07-25 09:13:44 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2009-07-25 09:13:44 +0200
commit441c122606e3a921a947f4126a414c9974d64533 (patch)
treea6ad7f810150142b2d0f2a51ee49a1ddbff285a5 /package/libgtk2/libgtk2.mk
parent8c1fc169ab7330ddaed774d1e780b9d81edb4f25 (diff)
parent74ecbaa23da486182a1bb20b43361aaf2a478877 (diff)
downloadbuildroot-novena-441c122606e3a921a947f4126a414c9974d64533.tar.gz
buildroot-novena-441c122606e3a921a947f4126a414c9974d64533.zip
Merge branch 'xorg' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/libgtk2/libgtk2.mk')
-rw-r--r--package/libgtk2/libgtk2.mk4
1 files changed, 2 insertions, 2 deletions
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