From 565e05c8a18ecb7ffff0018b598218d32399d8b7 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Sat, 14 Jun 2008 21:01:16 +0000
Subject: packages: fix pkgconfig depencies and select pkgconfig where needed

---
 package/java/classpath/Config.in    | 1 +
 package/java/classpath/classpath.mk | 2 +-
 package/java/jamvm/Config.in        | 2 +-
 package/java/jamvm/jamvm.mk         | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'package/java')

diff --git a/package/java/classpath/Config.in b/package/java/classpath/Config.in
index efd6e0b7f..15ea83360 100644
--- a/package/java/classpath/Config.in
+++ b/package/java/classpath/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_CLASSPATH
 	bool "classpath"
+	select BR2_PACKAGE_PKGCONFIG
 	default n
 
 	help
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index cd9cc3565..0e0eaa3da 100644
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -58,7 +58,7 @@ CLASSPATH_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
 		--disable-debug PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		--disable-gconf-peer --disable-examples --disable-plugin
 
-CLASSPATH_DEPENDENCIES = uclibc png jpeg tiff
+CLASSPATH_DEPENDENCIES = uclibc pkgconfig png jpeg tiff
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 	CLASSPATH_DEPENDENCIES+= alsa-lib
diff --git a/package/java/jamvm/Config.in b/package/java/jamvm/Config.in
index 53673c9e6..2f2ddd787 100644
--- a/package/java/jamvm/Config.in
+++ b/package/java/jamvm/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_JAMVM
 	bool "jamvm"
 	default n
         depends on BR2_PACKAGE_CLASSPATH
-
+	select BR2_PACKAGE_PKGCONFIG
 	help
 	  JamVM is a new Java Virtual Machine which conforms to 
 	  the JVM specification version 2 (blue book). 
diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
index 0cb015760..951d091d8 100644
--- a/package/java/jamvm/jamvm.mk
+++ b/package/java/jamvm/jamvm.mk
@@ -57,7 +57,7 @@ JAMVM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
 		--with-classpath-install-dir=/usr \
 
 
-JAMVM_DEPENDENCIES = uclibc classpath
+JAMVM_DEPENDENCIES = uclibc pkgconfig classpath
 
 #Include X libraries when we have an X server
 ifneq ($(BR2_PACKAGE_XSERVER_none),y)
-- 
cgit v1.2.3