Change how configure is called

diff --git a/build-package.sh b/build-package.sh
index eb04618..c067946 100755 (executable)
--- 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 b55d059..6556187 100644 (file)
--- 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
 }