diff options
Diffstat (limited to 'package/java')
-rw-r--r-- | package/java/classpath/classpath.mk | 4 | ||||
-rw-r--r-- | package/java/jamvm/jamvm.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk index 71c18a045..d037adfe6 100644 --- a/package/java/classpath/classpath.mk +++ b/package/java/classpath/classpath.mk @@ -77,8 +77,8 @@ else CLASSPATH_CONF_OPT+= --disable-gtk-peer endif -ifneq ($(BR2_PACKAGE_XSERVER_none),y) - CLASSPATH_DEPENDENCIES+= $(XSERVER) +ifeq ($(BR2_PACKAGE_XORG7),y) + CLASSPATH_DEPENDENCIES+= xserver_xorg-server CLASSPATH_CONF_OPT+= --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk index dff089af4..750bfae23 100644 --- a/package/java/jamvm/jamvm.mk +++ b/package/java/jamvm/jamvm.mk @@ -52,8 +52,8 @@ JAMVM_CONF_OPT = \ JAMVM_DEPENDENCIES = uclibc host-pkgconfig classpath #Include X libraries when we have an X server -ifneq ($(BR2_PACKAGE_XSERVER_none),y) - JAMVM_DEPENDENCIES+= $(XSERVER) +ifeq ($(BR2_PACKAGE_XORG7),y) + JAMVM_DEPENDENCIES+= xserver_xorg-server JAMVM_CONF_OPT+= --with-x \ --x-includes=$(STAGING_DIR)/usr/include/X11 \ --x-libraries=$(STAGING_DIR)/usr/lib |