From 6c2692459b7bf149e5468c8245a4b239eba2ec04 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 17 Nov 2015 14:21:55 -0500
Subject: [PATCH] Change how configure is called

---
 build-package.sh          | 3 +--
 packages/cmatrix/build.sh | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/build-package.sh b/build-package.sh
index eb0461820..c06794663 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -344,12 +344,11 @@ termux_step_configure () {
 	# also cause problems with e.g. malloc interceptors such as libgc:
 	local AVOID_AUTOCONF_WRAPPERS="ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
 
-	$TERMUX_PKG_SRCDIR/configure \
+	env $AVOID_AUTOCONF_WRAPPERS $TERMUX_PKG_SRCDIR/configure \
 		--disable-dependency-tracking \
 		--prefix=$TERMUX_PREFIX \
                 --disable-rpath --disable-rpath-hack \
 		$HOST_FLAG \
-		$AVOID_AUTOCONF_WRAPPERS \
 		$TERMUX_PKG_EXTRA_CONFIGURE_ARGS \
 		$DISABLE_NLS \
 		$ENABLE_SHARED \
diff --git a/packages/cmatrix/build.sh b/packages/cmatrix/build.sh
index b55d05910..6556187cb 100644
--- a/packages/cmatrix/build.sh
+++ b/packages/cmatrix/build.sh
@@ -10,7 +10,4 @@ termux_step_pre_configure () {
 	export ac_cv_file__usr_share_consolefonts=no
 	export ac_cv_file__usr_lib_X11_fonts_misc=no
 	export ac_cv_file__usr_X11R6_lib_X11_fonts_misc=no
-
-	# Fix old configure script broken by configure args:
-	cd $TERMUX_PKG_SRCDIR && autoconf
 }