| Message ID | fab626bf3a29d960cffe4ceac5f04205715fc0a8.1357507764.git.thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | 8b95ee78a4cdf77ffcb86d30aee1a72e848e04cc |
| Headers | show |
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> ATK is not directly related to X11, and the --with-x, --x-includes,
Thomas> --x-libraries and --without-x options do not exist.
Thomas> The --disable-glibtest was duplicated, and is therefore still passed
Thomas> to the configuration options.
Committed, thanks.
diff --git a/package/atk/atk.mk b/package/atk/atk.mk index 987a1cb..0453acb 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -41,14 +41,6 @@ ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \ ATK_CONF_OPT = --disable-glibtest --enable-explicit-deps=no \ --disable-debug -ifeq ($(BR2_PACKAGE_XORG7),y) -ATK_CONF_OPT += --with-x \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest -else -ATK_CONF_OPT += --without-x -endif - ATK_DEPENDENCIES = libglib2 host-pkgconf HOST_ATK_CONF_OPT = \
ATK is not directly related to X11, and the --with-x, --x-includes, --x-libraries and --without-x options do not exist. The --disable-glibtest was duplicated, and is therefore still passed to the configuration options. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/atk/atk.mk | 8 -------- 1 file changed, 8 deletions(-)