diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-01-30 12:15:43 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2011-01-30 12:15:43 +0100 |
| commit | b48f9d9a2310718611c693690319fa6bafdb0583 (patch) | |
| tree | 39b82fce4a80cd1fe6b1902378d69d3e171ded19 /mk/macros.mk | |
| parent | 50af16dfca66ec250c584dc946f7c4d213421cf2 (diff) | |
| download | embtoolkit-b48f9d9a2310718611c693690319fa6bafdb0583.tar.gz embtoolkit-b48f9d9a2310718611c693690319fa6bafdb0583.tar.bz2 embtoolkit-b48f9d9a2310718611c693690319fa6bafdb0583.tar.xz | |
Generic configure macro improvement
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk/macros.mk')
| -rw-r--r-- | mk/macros.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/macros.mk b/mk/macros.mk index d8d5777..eb00f12 100644 --- a/mk/macros.mk +++ b/mk/macros.mk @@ -239,8 +239,9 @@ define EMBTK_PRINT_CONFIGURE_OPTS endef define EMBTK_CONFIGURE_PKG $(call EMBTK_GENERIC_MSG,"Configure $($(1)_PACKAGE)...") - @test -e $($(1)_SRC_DIR)/configure.ac || exit 1 - $(call EMBTK_CONFIGURE_AUTORECONF_PKG,$(1)) + @test -e $($(1)_SRC_DIR)/configure.ac || \ + test -e $($(1)_SRC_DIR)/configure.in || exit 1 + $(call EMBTK_CONFIGURE_AUTORECONF_PKG,$(1)) $(call EMBTK_PRINT_CONFIGURE_OPTS,"$($(1)_CONFIGURE_OPTS)") @cd $($(1)_BUILD_DIR); \ CC=$(TARGETCC_CACHED) \ @@ -259,11 +260,13 @@ define EMBTK_CONFIGURE_PKG CPPFLAGS="-I$(SYSROOT)/usr/include" \ PKG_CONFIG=$(PKGCONFIG_BIN) \ PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ + ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes \ $($(1)_CONFIGURE_ENV) \ $(CONFIG_SHELL) $($(1)_SRC_DIR)/configure \ --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \ - --prefix=/usr $($(1)_CONFIGURE_OPTS) + --prefix=/usr --disable-rpath $($(1)_CONFIGURE_OPTS) @touch $($(1)_BUILD_DIR)/.configured $(call EMBTK_KILL_LT_RPATH,"$($(1)_BUILD_DIR)") endef |