diff options
| -rw-r--r-- | kconfig/pkgconfig.kconfig | 15 | ||||
| -rw-r--r-- | mk/pkgconfig.mk | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/kconfig/pkgconfig.kconfig b/kconfig/pkgconfig.kconfig index 5d2fe20..60383db 100644 --- a/kconfig/pkgconfig.kconfig +++ b/kconfig/pkgconfig.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2011 Abdoulaye Walsimou GAYE. +# Copyright(C) 2011-2012 Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -33,11 +33,16 @@ config EMBTK_PKGCONFIG_VERSION_STRING string default "0.25" +config EMBTK_PKGCONFIG_VERSION_GIT + bool + +config EMBTK_PKGCONFIG_GIT_SITE + string + default "git://anongit.freedesktop.org/pkg-config" + depends on EMBTK_PKGCONFIG_VERSION_GIT + config EMBTK_PKGCONFIG_NEED_PATCH bool config EMBTK_PKGCONFIG_NEED_AUTORECONF bool -config EMBTK_PKGCONFIG_PKG_IS_TARGZ - bool -config EMBTK_PKGCONFIG_PKG_IS_TARBZ2 - bool + default y if EMBTK_PKGCONFIG_VERSION_GIT diff --git a/mk/pkgconfig.mk b/mk/pkgconfig.mk index c211922..ae49a17 100644 --- a/mk/pkgconfig.mk +++ b/mk/pkgconfig.mk @@ -1,6 +1,5 @@ ################################################################################ -# Abdoulaye Walsimou GAYE <awg@embtoolkit.org> -# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE. +# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE <awg@embtoolkit.org> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -45,6 +44,7 @@ __EMBTK_HOST_PKG_CONFIG_PATH += $(dir $(shell find /usr/local/lib -type f -name EMBTK_HOST_PKG_CONFIG_PATH := $(subst $(embtk_space),:,$(sort $(__EMBTK_HOST_PKG_CONFIG_PATH))) PKGCONFIG_CONFIGURE_OPTS := --with-pc-path="$(EMBTK_HOST_PKG_CONFIG_PATH)" +PKGCONFIG_CONFIGURE_OPTS += --with-internal-glib export PKGCONFIG_BIN EMBTK_PKG_CONFIG_PATH EMBTK_PKG_CONFIG_LIBDIR export EMBTK_HOST_PKG_CONFIG_PATH |