From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 28 Oct 2022 16:44:50 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ooQbK-005SWp-Hc for lore@lore.pengutronix.de; Fri, 28 Oct 2022 16:44:50 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ooQbJ-0006ro-4K; Fri, 28 Oct 2022 16:44:49 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ooQad-0006Jl-4a; Fri, 28 Oct 2022 16:44:07 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1ooQad-000v20-DF; Fri, 28 Oct 2022 16:44:06 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ooQab-009PYq-RO; Fri, 28 Oct 2022 16:44:05 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 28 Oct 2022 16:44:05 +0200 Message-Id: <20221028144405.2242637-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] rules: Replace deprecated _AUTOCONF X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Ladislav Michl Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as d82f0cd5657851a854e0731e8255ae3d40ce2af1. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:05 +0200, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/argtable2.make b/rules/argtable2.make > index 48d6d92aa776..79630e2754a4 100644 > --- a/rules/argtable2.make > +++ b/rules/argtable2.make > @@ -34,7 +34,8 @@ ARGTABLE2_LICENSE_FILES := \ > # > # autoconf > # > -ARGTABLE2_AUTOCONF := \ > +ARGTABLE2_CONF_TOOL := autoconf > +ARGTABLE2_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-debug > > diff --git a/rules/bash.make b/rules/bash.make > index ef07053abc66..86dc532348b0 100644 > --- a/rules/bash.make > +++ b/rules/bash.make > @@ -29,12 +29,13 @@ BASH_LICENSE_FILES := \ > # Prepare > # ---------------------------------------------------------------------------- > > -BASH_ENV := \ > +BASH_CONF_ENV := \ > $(CROSS_ENV) \ > bash_cv_job_control_missing=$(call ptx/ifdef, PTXCONF_BASH_JOBS, present, missing) \ > bash_cv_termcap_lib=$(call ptx/ifdef, PTXCONF_BASH_CURSES, libncurses, libtermcap) > > -BASH_AUTOCONF := \ > +BASH_CONF_TOOL := autoconf > +BASH_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --without-bash-malloc \ > diff --git a/rules/bc.make b/rules/bc.make > index 9aad230583c2..c23cf0707bc6 100644 > --- a/rules/bc.make > +++ b/rules/bc.make > @@ -34,7 +34,8 @@ BC_LICENSE_FILES := \ > # > # autoconf > # > -BC_AUTOCONF := $(CROSS_AUTOCONF_USR) > +BC_CONF_TOOL := autoconf > +BC_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/binutils.make b/rules/binutils.make > index ca1080bc811d..17b7f7e3e313 100644 > --- a/rules/binutils.make > +++ b/rules/binutils.make > @@ -38,7 +38,8 @@ BINUTILS_CONF_ENV := \ > # > # autoconf > # > -BINUTILS_AUTOCONF := \ > +BINUTILS_CONF_TOOL := autoconf > +BINUTILS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --target=$(PTXCONF_GNU_TARGET) \ > --disable-werror > diff --git a/rules/bridge-utils.make b/rules/bridge-utils.make > index 9034e65509e3..3ba5ce191540 100644 > --- a/rules/bridge-utils.make > +++ b/rules/bridge-utils.make > @@ -36,7 +36,7 @@ BRIDGE_UTILS_CONF_TOOL := autoconf > > # Set with-linux-headers to something that doesn't exist to avoid the default > # path picking up a path from the build host. > -BRIDGE_UTILS_AUTOCONF := \ > +BRIDGE_UTILS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-linux-headers=/this/path/must/not/exist > > diff --git a/rules/cairomm.make b/rules/cairomm.make > index f0b3d82debef..6d73ab0b5dce 100644 > --- a/rules/cairomm.make > +++ b/rules/cairomm.make > @@ -30,7 +30,8 @@ CAIROMM_DIR := $(BUILDDIR)/$(CAIROMM) > # > # autoconf > # > -CAIROMM_AUTOCONF := \ > +CAIROMM_CONF_TOOL := autoconf > +CAIROMM_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-documentation \ > --disable-tests > diff --git a/rules/classpath.make b/rules/classpath.make > index f5d095f18758..4c7a3620aedd 100644 > --- a/rules/classpath.make > +++ b/rules/classpath.make > @@ -28,7 +28,7 @@ CLASSPATH_DIR := $(BUILDDIR)/$(CLASSPATH) > # Prepare > # ---------------------------------------------------------------------------- > > -CLASSPATH_ENV := \ > +CLASSPATH_CONF_ENV := \ > $(CROSS_ENV) \ > JAVAC=$(PTXCONF_SETUP_JAVA_SDK)/bin/javac \ > JAVA=jamvm \ > @@ -43,7 +43,8 @@ CLASSPATH_ENV := \ > # > # autoconf > # > -CLASSPATH_AUTOCONF := \ > +CLASSPATH_CONF_TOOL := autoconf > +CLASSPATH_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-option-checking \ > --disable-collections \ > diff --git a/rules/daemonize.make b/rules/daemonize.make > index db9bbb2e5b83..6b7d591bada8 100644 > --- a/rules/daemonize.make > +++ b/rules/daemonize.make > @@ -32,7 +32,8 @@ DAEMONIZE_LICENSE_FILES := file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f > # > # autoconf > # > -DAEMONIZE_AUTOCONF := $(CROSS_AUTOCONF_USR) > +DAEMONIZE_CONF_TOOL := autoconf > +DAEMONIZE_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/dash.make b/rules/dash.make > index 398f83ada010..343e132e8bba 100644 > --- a/rules/dash.make > +++ b/rules/dash.make > @@ -34,7 +34,8 @@ DASH_LICENSE_FILES := \ > # > # autoconf > # > -DASH_AUTOCONF := \ > +DASH_CONF_TOOL := autoconf > +DASH_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-libedit=no > > diff --git a/rules/dbench.make b/rules/dbench.make > index 4c016b0646c7..7413d7091543 100644 > --- a/rules/dbench.make > +++ b/rules/dbench.make > @@ -30,14 +30,17 @@ DBENCH_LICENSE_FILES := \ > # Prepare > # ---------------------------------------------------------------------------- > > -DBENCH_CONV_ENV := $(CROSS_ENV) > -DBENCH_MAKE_ENV := $(CROSS_ENV) > -DBENCH_INSTALL_OPT := prefix=$(PKGDIR)/$(DBENCH)/usr install > - > # > # autoconf > # > -DBENCH_AUTOCONF := $(CROSS_AUTOCONF_USR) > +DBENCH_CONF_TOOL := autoconf > +DBENCH_CONF_OPT := $(CROSS_AUTOCONF_USR) > + > +# ---------------------------------------------------------------------------- > +# Install > +# ---------------------------------------------------------------------------- > + > +DBENCH_INSTALL_OPT := prefix=$(PKGDIR)/$(DBENCH)/usr install > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/diffutils.make b/rules/diffutils.make > index e388620932f1..28506a833de0 100644 > --- a/rules/diffutils.make > +++ b/rules/diffutils.make > @@ -34,7 +34,8 @@ DIFFUTILS_LICENSE_FILES := \ > # > # autoconf > # > -DIFFUTILS_AUTOCONF := $(CROSS_AUTOCONF_USR) > +DIFFUTILS_CONF_TOOL := autoconf > +DIFFUTILS_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/eggdbus.make b/rules/eggdbus.make > index 46fff9313c0f..724735b86126 100644 > --- a/rules/eggdbus.make > +++ b/rules/eggdbus.make > @@ -27,7 +27,8 @@ EGGDBUS_LICENSE := LGPL-2.0-only > # Prepare > # ---------------------------------------------------------------------------- > > -EGGDBUS_AUTOCONF := \ > +EGGDBUS_CONF_TOOL := autoconf > +EGGDBUS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --disable-static \ > diff --git a/rules/eventlog.make b/rules/eventlog.make > index 91740b16d288..391a864880e0 100644 > --- a/rules/eventlog.make > +++ b/rules/eventlog.make > @@ -30,7 +30,8 @@ EVENTLOG_LICENSE := BSD-3-Clause > # > # autoconf > # > -EVENTLOG_AUTOCONF := $(CROSS_AUTOCONF_USR) > +EVENTLOG_CONF_TOOL := autoconf > +EVENTLOG_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/failmalloc.make b/rules/failmalloc.make > index f79a5fc5790b..85b1ac045877 100644 > --- a/rules/failmalloc.make > +++ b/rules/failmalloc.make > @@ -33,7 +33,8 @@ FAILMALLOC_LICENSE_FILES := \ > # > # autoconf > # > -FAILMALLOC_AUTOCONF := \ > +FAILMALLOC_CONF_TOOL := autoconf > +FAILMALLOC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-static=no > > diff --git a/rules/fcgi.make b/rules/fcgi.make > index dbe4e6f0d875..1ff327672b03 100644 > --- a/rules/fcgi.make > +++ b/rules/fcgi.make > @@ -26,7 +26,8 @@ FCGI_LICENSE_FILES := file://LICENSE.TERMS;md5=e3aacac3a647af6e7e31f181cda0a06a > # Prepare > # ---------------------------------------------------------------------------- > > -FCGI_AUTOCONF := $(CROSS_AUTOCONF_USR) > +FCGI_CONF_TOOL := autoconf > +FCGI_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/fftw.make b/rules/fftw.make > index 14f4c68a5277..8c1a8fff93d0 100644 > --- a/rules/fftw.make > +++ b/rules/fftw.make > @@ -36,7 +36,8 @@ FFTW_LICENSE_FILES := \ > # > # autoconf > # > -FFTW_AUTOCONF := \ > +FFTW_CONF_TOOL := autoconf > +FFTW_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-shared > > diff --git a/rules/findutils.make b/rules/findutils.make > index 4379deafbe24..d3dab34e8976 100644 > --- a/rules/findutils.make > +++ b/rules/findutils.make > @@ -39,7 +39,8 @@ FINDUTILS_DBASE_PATH := /var/lib/locate > # > # autoconf > # > -FINDUTILS_AUTOCONF := \ > +FINDUTILS_CONF_TOOL := autoconf > +FINDUTILS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --libexecdir=/usr/bin \ > --localstatedir=$(FINDUTILS_DBASE_PATH) \ > diff --git a/rules/frodo.make b/rules/frodo.make > index 6614892b0e8d..53f666eda62c 100644 > --- a/rules/frodo.make > +++ b/rules/frodo.make > @@ -34,12 +34,12 @@ FRODO_CONF_ENV += ac_cv_lib_vga_vga_setmode=yes SDL_CONFIG=no > endif > FRODO_MAKE_ENV := $(CROSS_ENV) > FRODO_SUBDIR := Src > -FRODO_CONF_TOOL := autoconf > > # > # autoconf > # > -FRODO_AUTOCONF := \ > +FRODO_CONF_TOOL := autoconf > +FRODO_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --without-x > > diff --git a/rules/glibmm.make b/rules/glibmm.make > index 543a16c4353d..1c8170cc1027 100644 > --- a/rules/glibmm.make > +++ b/rules/glibmm.make > @@ -34,7 +34,8 @@ GLIBMM_LICENSE_FILES := \ > # > # autoconf > # > -GLIBMM_AUTOCONF := \ > +GLIBMM_CONF_TOOL := autoconf > +GLIBMM_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-documentation > > diff --git a/rules/gnuplot.make b/rules/gnuplot.make > index 50aafd2e8952..276882f130b2 100644 > --- a/rules/gnuplot.make > +++ b/rules/gnuplot.make > @@ -33,7 +33,8 @@ GNUPLOT_LICENSE_FILES := file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f > # > # autoconf > # > -GNUPLOT_AUTOCONF = \ > +GNUPLOT_CONF_TOOL := autoconf > +GNUPLOT_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-history-file \ > --$(call ptx/endis, PTXCONF_GNUPLOT_X)-mouse \ > diff --git a/rules/grub.make b/rules/grub.make > index 5cf3d15135f6..a85321172e68 100644 > --- a/rules/grub.make > +++ b/rules/grub.make > @@ -35,7 +35,8 @@ GRUB_CFLAGS := -fgnu89-inline > GRUB_WRAPPER_BLACKLIST := \ > $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) > > -GRUB_AUTOCONF := \ > +GRUB_CONF_TOOL := autoconf > +GRUB_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --without-curses \ > --target=$(PTXCONF_GNU_TARGET) \ > @@ -95,31 +96,31 @@ GRUB_AUTOCONF := \ > --$(call ptx/endis, PTXCONF_GRUB_AUTO_LINUX_MEM_OPT)-auto-linux-mem-opt > > ifneq ("$(PTXCONF_GRUB_SMC9000_SCAN)","") > -GRUB_AUTOCONF += --enable-smc9000-scan=$(PTXCONF_GRUB_SMC9000_SCAN) > +GRUB_CONF_OPT += --enable-smc9000-scan=$(PTXCONF_GRUB_SMC9000_SCAN) > else > -GRUB_AUTOCONF += --disable-smc9000-scan > +GRUB_CONF_OPT += --disable-smc9000-scan > endif > > ifneq ($(strip $(call remove_quotes,$(PTXCONF_GRUB_NE_SCAN))),) > -GRUB_AUTOCONF += --enable-ne-scan=$(PTXCONF_GRUB_NE_SCAN) > +GRUB_CONF_OPT += --enable-ne-scan=$(PTXCONF_GRUB_NE_SCAN) > endif > > ifneq ("$(PTXCONF_GRUB_WD_DEFAULT_MEM)","") > -GRUB_AUTOCONF += --enable-wd-default-mem=$(PTXCONF_GRUB_WD_DEFAULT_MEM) > +GRUB_CONF_OPT += --enable-wd-default-mem=$(PTXCONF_GRUB_WD_DEFAULT_MEM) > else > -GRUB_AUTOCONF += --disable-wd-default-mem > +GRUB_CONF_OPT += --disable-wd-default-mem > endif > > ifneq ("$(PTXCONF_GRUB_CS_SCAN)","") > -GRUB_AUTOCONF += --enable-cs-scan=$(PTXCONF_GRUB_CS_SCAN) > +GRUB_CONF_OPT += --enable-cs-scan=$(PTXCONF_GRUB_CS_SCAN) > else > -GRUB_AUTOCONF += --disable-cs-scan > +GRUB_CONF_OPT += --disable-cs-scan > endif > > ifneq ("$(PTXCONF_GRUB_PRESET_MENU)","") > -GRUB_AUTOCONF += --enable-preset-menu=$(PTXCONF_GRUB_PRESET_MENU) > +GRUB_CONF_OPT += --enable-preset-menu=$(PTXCONF_GRUB_PRESET_MENU) > else > -GRUB_AUTOCONF += --disable-preset-menu > +GRUB_CONF_OPT += --disable-preset-menu > endif > > # ---------------------------------------------------------------------------- > diff --git a/rules/gtk-engines.make b/rules/gtk-engines.make > index bbbe1162da41..c549aa21b32a 100644 > --- a/rules/gtk-engines.make > +++ b/rules/gtk-engines.make > @@ -31,7 +31,8 @@ GTK_ENGINES_DIR := $(BUILDDIR)/$(GTK_ENGINES) > # > # autoconf > # > -GTK_ENGINES_AUTOCONF := \ > +GTK_ENGINES_CONF_TOOL := autoconf > +GTK_ENGINES_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-schemas > > diff --git a/rules/haserl.make b/rules/haserl.make > index e270d0082396..b5db55ab9147 100644 > --- a/rules/haserl.make > +++ b/rules/haserl.make > @@ -32,7 +32,8 @@ HASERL_LICENSE_FILES := file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f > # > # autoconf > # > -HASERL_AUTOCONF = $(CROSS_AUTOCONF_USR) > +HASERL_CONF_TOOL := autoconf > +HASERL_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/host-eggdbus.make b/rules/host-eggdbus.make > index 447041777329..7764ec7dc045 100644 > --- a/rules/host-eggdbus.make > +++ b/rules/host-eggdbus.make > @@ -16,7 +16,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_EGGDBUS) += host-eggdbus > # Prepare > # ---------------------------------------------------------------------------- > > -HOST_EGGDBUS_AUTOCONF := \ > +HOST_EGGDBUS_CONF_TOOL := autoconf > +HOST_EGGDBUS_CONF_OPT := \ > $(HOST_AUTOCONF) \ > --disable-static \ > --disable-man-pages \ > diff --git a/rules/host-genext2fs.make b/rules/host-genext2fs.make > index 5c1a4983e00a..b13fb5ef9b31 100644 > --- a/rules/host-genext2fs.make > +++ b/rules/host-genext2fs.make > @@ -31,11 +31,10 @@ HOST_GENEXT2FS_LICENSE_FILES := \ > # Prepare > # ---------------------------------------------------------------------------- > > -HOST_GENEXT2FS_ENV := $(HOST_ENV) > - > # > # autoconf > # > -HOST_GENEXT2FS_AUTOCONF := $(HOST_AUTOCONF) > +HOST_GENEXT2FS_CONF_TOOL := autoconf > +HOST_GENEXT2FS_CONF_OPT := $(HOST_AUTOCONF) > > # vim: syntax=make > diff --git a/rules/host-gettext.make b/rules/host-gettext.make > index 71c9d2ce31e5..5159c263c7d0 100644 > --- a/rules/host-gettext.make > +++ b/rules/host-gettext.make > @@ -19,7 +19,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_GETTEXT) += host-gettext > # > # autoconf > # > -HOST_GETTEXT_AUTOCONF := \ > +HOST_GETTEXT_CONF_TOOL := autoconf > +HOST_GETTEXT_CONF_OPT := \ > $(HOST_AUTOCONF) \ > --disable-java \ > --disable-csharp \ > diff --git a/rules/host-gperf.make b/rules/host-gperf.make > index 8610b231a6f3..bcd490766d5b 100644 > --- a/rules/host-gperf.make > +++ b/rules/host-gperf.make > @@ -27,11 +27,9 @@ HOST_GPERF_LICENSE := GPL-3.0-only > # Prepare > # ---------------------------------------------------------------------------- > > -HOST_GPERF_ENV := $(HOST_ENV) > - > # > # autoconf > # > -HOST_GPERF_AUTOCONF := $(HOST_AUTOCONF) > +HOST_GPERF_CONF_TOOL := autoconf > > # vim: syntax=make > diff --git a/rules/host-libgd.make b/rules/host-libgd.make > index acd9fae2b226..8e108a216ab2 100644 > --- a/rules/host-libgd.make > +++ b/rules/host-libgd.make > @@ -23,7 +23,8 @@ HOST_LIBGD_DIR = $(HOST_BUILDDIR)/$(LIBGD) > # > # autoconf > # > -HOST_LIBGD_AUTOCONF := \ > +HOST_LIBGD_CONF_TOOL := autoconf > +HOST_LIBGD_CONF_OPT := \ > $(HOST_AUTOCONF) \ > --without-x \ > --without-jpeg \ > diff --git a/rules/host-libpng.make b/rules/host-libpng.make > index 9b4552a1a06e..3cb9caaa41dd 100644 > --- a/rules/host-libpng.make > +++ b/rules/host-libpng.make > @@ -23,6 +23,6 @@ HOST_LIBPNG_DIR = $(HOST_BUILDDIR)/$(LIBPNG) > # > # autoconf > # > -HOST_LIBPNG_AUTOCONF := $(HOST_AUTOCONF) > +HOST_LIBPNG_CONF_TOOL := autoconf > > # vim: syntax=make > diff --git a/rules/host-libpthread-stubs.make b/rules/host-libpthread-stubs.make > index b8fc7ed8ce07..da66793cdb93 100644 > --- a/rules/host-libpthread-stubs.make > +++ b/rules/host-libpthread-stubs.make > @@ -23,6 +23,6 @@ HOST_LIBPTHREAD_STUBS_DIR = $(HOST_BUILDDIR)/$(LIBPTHREAD_STUBS) > # > # autoconf > # > -HOST_LIBPTHREAD_STUBS_AUTOCONF := $(HOST_AUTOCONF) > +HOST_LIBPTHREAD_STUBS_CONF_TOOL := autoconf > > # vim: syntax=make > diff --git a/rules/host-libsigcpp.make b/rules/host-libsigcpp.make > index 9538c171f809..306505adf3e4 100644 > --- a/rules/host-libsigcpp.make > +++ b/rules/host-libsigcpp.make > @@ -23,6 +23,6 @@ HOST_LIBSIGCPP_DIR = $(HOST_BUILDDIR)/$(LIBSIGCPP) > # > # autoconf > # > -HOST_LIBSIGCPP_AUTOCONF := $(HOST_AUTOCONF) > +HOST_LIBSIGCPP_CONF_TOOL := autoconf > > # vim: syntax=make > diff --git a/rules/host-libusb.make b/rules/host-libusb.make > index 6744936602b6..aed143b6c4c5 100644 > --- a/rules/host-libusb.make > +++ b/rules/host-libusb.make > @@ -22,7 +22,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBUSB) += host-libusb > # > # autoconf > # > -HOST_LIBUSB_AUTOCONF := \ > +HOST_LIBUSB_CONF_TOOL := autoconf > +HOST_LIBUSB_CONF_OPT := \ > $(HOST_AUTOCONF) \ > --enable-shared \ > --disable-static \ > diff --git a/rules/host-libxml2.make b/rules/host-libxml2.make > index d0257eaa2922..f1769358bb62 100644 > --- a/rules/host-libxml2.make > +++ b/rules/host-libxml2.make > @@ -24,7 +24,8 @@ HOST_LIBXML2_DIR = $(HOST_BUILDDIR)/$(LIBXML2) > # > # autoconf > # > -HOST_LIBXML2_AUTOCONF := \ > +HOST_LIBXML2_CONF_TOOL := autoconf > +HOST_LIBXML2_CONF_OPT := \ > $(HOST_AUTOCONF) \ > --disable-static \ > --without-iconv \ > diff --git a/rules/host-libxslt.make b/rules/host-libxslt.make > index 01dbaebf68ba..06cce14cf8a2 100644 > --- a/rules/host-libxslt.make > +++ b/rules/host-libxslt.make > @@ -24,7 +24,8 @@ HOST_LIBXSLT_DIR = $(HOST_BUILDDIR)/$(LIBXSLT) > # > # autoconf > # > -HOST_LIBXSLT_AUTOCONF := \ > +HOST_LIBXSLT_CONF_TOOL := autoconf > +HOST_LIBXSLT_CONF_OPT := \ > $(HOST_AUTOCONF) \ > --disable-static \ > --without-crypto \ > diff --git a/rules/host-lrzsz.make b/rules/host-lrzsz.make > index 9fcafcbba6b2..be47464d9601 100644 > --- a/rules/host-lrzsz.make > +++ b/rules/host-lrzsz.make > @@ -18,7 +18,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_LRZSZ) += host-lrzsz > # > # autoconf > # > -HOST_LRZSZ_AUTOCONF := \ > +HOST_LRZSZ_CONF_TOOL := autoconf > +HOST_LRZSZ_CONF_OPT := \ > $(HOST_AUTOCONF) \ > --disable-nls > > diff --git a/rules/host-pelts.make b/rules/host-pelts.make > index f0800b01d581..444ea77712b6 100644 > --- a/rules/host-pelts.make > +++ b/rules/host-pelts.make > @@ -32,6 +32,6 @@ HOST_PELTS_DIR := $(HOST_BUILDDIR)/$(HOST_PELTS) > # > # autoconf > # > -HOST_PELTS_AUTOCONF := $(HOST_AUTOCONF) > +HOST_PELTS_CONF_TOOL := autoconf > > # vim: syntax=make > diff --git a/rules/host-xorg-app-bdftopcf.make b/rules/host-xorg-app-bdftopcf.make > index 40c516a3c540..5ea990e64fb9 100644 > --- a/rules/host-xorg-app-bdftopcf.make > +++ b/rules/host-xorg-app-bdftopcf.make > @@ -42,6 +42,6 @@ $(STATEDIR)/host-xorg-app-bdftopcf.extract: > # > # autoconf > # > -HOST_XORG_APP_BDFTOPCF_AUTOCONF := $(HOST_AUTOCONF) > +HOST_XORG_APP_BDFTOPCF_CONF_TOOL := autoconf > > # vim: syntax=make > diff --git a/rules/host-xorg-app-mkfontscale.make b/rules/host-xorg-app-mkfontscale.make > index 624d502b2718..543766a13ae5 100644 > --- a/rules/host-xorg-app-mkfontscale.make > +++ b/rules/host-xorg-app-mkfontscale.make > @@ -24,6 +24,6 @@ HOST_XORG_APP_MKFONTSCALE_DIR = $(HOST_BUILDDIR)/$(XORG_APP_MKFONTSCALE) > # > # autoconf > # > -HOST_XORG_APP_MKFONTSCALE_AUTOCONF := $(HOST_AUTOCONF) > +HOST_XORG_APP_MKFONTSCALE_CONF_TOOL := autoconf > > # vim: syntax=make > diff --git a/rules/host-xorg-font-util.make b/rules/host-xorg-font-util.make > index a11c864049c6..cacd4f90b81b 100644 > --- a/rules/host-xorg-font-util.make > +++ b/rules/host-xorg-font-util.make > @@ -24,6 +24,6 @@ HOST_XORG_FONT_UTIL_DIR = $(HOST_BUILDDIR)/$(XORG_FONT_UTIL) > # > # autoconf > # > -HOST_XORG_FONT_UTIL_AUTOCONF := $(HOST_AUTOCONF) > +HOST_XORG_FONT_UTIL_CONF_TOOL := autoconf > > # vim: syntax=make > diff --git a/rules/host-xorg-lib-Xau.make b/rules/host-xorg-lib-Xau.make > index 73c634fcc3bb..ae64054dba8c 100644 > --- a/rules/host-xorg-lib-Xau.make > +++ b/rules/host-xorg-lib-Xau.make > @@ -19,6 +19,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_XORG_LIB_XAU) += host-xorg-lib-xau > # > # autoconf > # > -HOST_XORG_LIB_XAU_AUTOCONF := $(HOST_AUTOCONF) > +HOST_XORG_LIB_XAU_CONF_TOOL := autoconf > > # vim: syntax=make > diff --git a/rules/host-xorg-lib-fontenc.make b/rules/host-xorg-lib-fontenc.make > index 616d53c83e2b..57fa6edc3f56 100644 > --- a/rules/host-xorg-lib-fontenc.make > +++ b/rules/host-xorg-lib-fontenc.make > @@ -24,6 +24,6 @@ HOST_XORG_LIB_FONTENC_DIR = $(HOST_BUILDDIR)/$(XORG_LIB_FONTENC) > # > # autoconf > # > -HOST_XORG_LIB_FONTENC_AUTOCONF := $(HOST_AUTOCONF) > +HOST_XORG_LIB_FONTENC_CONF_TOOL := autoconf > > # vim: syntax=make > diff --git a/rules/host-xorg-lib-xtrans.make b/rules/host-xorg-lib-xtrans.make > index 649d319561ff..ff994b2c033f 100644 > --- a/rules/host-xorg-lib-xtrans.make > +++ b/rules/host-xorg-lib-xtrans.make > @@ -24,6 +24,6 @@ HOST_XORG_LIB_XTRANS_DIR = $(HOST_BUILDDIR)/$(XORG_LIB_XTRANS) > # > # autoconf > # > -HOST_XORG_LIB_XTRANS_AUTOCONF := $(HOST_AUTOCONF) > +HOST_XORG_LIB_XTRANS_CONF_TOOL := autoconf > > # vim: syntax=make > diff --git a/rules/ima-evm-utils.make b/rules/ima-evm-utils.make > index fb500fb169aa..ba3cc236bac7 100644 > --- a/rules/ima-evm-utils.make > +++ b/rules/ima-evm-utils.make > @@ -38,8 +38,8 @@ IMA_EVM_UTILS_CONF_ENV := \ > ac_cv_lib_tss2_rc_Tss2_RC_Decode=no \ > ac_cv_path_XMLCATALOG= > > -IMA_EVM_UTILS_CONF_TOOL := autoconf > -IMA_EVM_UTILS_AUTOCONF := \ > +IMA_EVM_UTILS_CONF_TOOL := autoconf > +IMA_EVM_UTILS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-openssl-conf \ > --disable-debug > diff --git a/rules/imagemagick.make b/rules/imagemagick.make > index f0a8c7062c7a..dbeba99cd266 100644 > --- a/rules/imagemagick.make > +++ b/rules/imagemagick.make > @@ -50,7 +50,8 @@ IMAGEMAGICK_QUANTUM_DEPTH := 8 > # supported configure options. Just ignore the generated delegates.xml > # file. > # > -IMAGEMAGICK_AUTOCONF := \ > +IMAGEMAGICK_CONF_TOOL := autoconf > +IMAGEMAGICK_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-openmp \ > --enable-shared \ > @@ -91,7 +92,6 @@ IMAGEMAGICK_AUTOCONF := \ > --without-wmf \ > --without-xml > > - > # ---------------------------------------------------------------------------- > # Target-Install > # ---------------------------------------------------------------------------- > diff --git a/rules/inotify-tools.make b/rules/inotify-tools.make > index efc1bee46d20..1f3b4367b947 100644 > --- a/rules/inotify-tools.make > +++ b/rules/inotify-tools.make > @@ -31,7 +31,8 @@ INOTIFY_TOOLS_LICENSE_FILES := file://COPYING;md5=59530bdf33659b29e73d4adb9f9f65 > # > # autoconf > # > -INOTIFY_TOOLS_AUTOCONF := $(CROSS_AUTOCONF_USR) > +INOTIFY_TOOLS_CONF_TOOL := autoconf > +INOTIFY_TOOLS_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/iperf.make b/rules/iperf.make > index a329481ade8b..34a165cb4e3a 100644 > --- a/rules/iperf.make > +++ b/rules/iperf.make > @@ -30,7 +30,8 @@ IPERF_LICENSE := BSD > # > # autoconf > # > -IPERF_AUTOCONF := \ > +IPERF_CONF_TOOL := autoconf > +IPERF_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_IPV6_OPTION) \ > --enable-multicast \ > diff --git a/rules/iperf3.make b/rules/iperf3.make > index c419de69210e..ad3fa8ffb344 100644 > --- a/rules/iperf3.make > +++ b/rules/iperf3.make > @@ -30,7 +30,8 @@ IPERF3_LICENSE := BSD > # > # autoconf > # > -IPERF3_AUTOCONF := \ > +IPERF3_CONF_TOOL := autoconf > +IPERF3_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-openssl=$(PTXDIST_SYSROOT_TARGET)/usr > > diff --git a/rules/jamvm.make b/rules/jamvm.make > index 894e84affe26..df181c10203b 100644 > --- a/rules/jamvm.make > +++ b/rules/jamvm.make > @@ -40,7 +40,8 @@ endif > # > # autoconf > # > -JAMVM_AUTOCONF := \ > +JAMVM_CONF_TOOL := autoconf > +JAMVM_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-int-threading \ > --enable-int-direct \ > @@ -53,49 +54,49 @@ JAMVM_AUTOCONF := \ > --with-classpath-install-dir=/usr > > ifdef PTXCONF_JAMVM_USE_LIBFFI > -JAMVM_AUTOCONF += --enable-ffi > +JAMVM_CONF_OPT += --enable-ffi > else > -JAMVM_AUTOCONF += --disable-ffi > +JAMVM_CONF_OPT += --disable-ffi > endif > > ifndef PTXCONF_JAMVM_TRACE > -JAMVM_AUTOCONF += --disable-trace > +JAMVM_CONF_OPT += --disable-trace > endif > > ifdef PTXCONF_JAMVM_TRACE_ALL > -JAMVM_AUTOCONF += --enable-trace > +JAMVM_CONF_OPT += --enable-trace > endif > > ifdef PTXCONF_JAMVM_TRACE_GC > -JAMVM_AUTOCONF += --enable-tracegc > +JAMVM_CONF_OPT += --enable-tracegc > endif > > ifdef PTXCONF_JAMVM_TRACE_ALLOC > -JAMVM_AUTOCONF += --enable-tracealloc > +JAMVM_CONF_OPT += --enable-tracealloc > endif > > ifdef PTXCONF_JAMVM_TRACE_FNLZ > -JAMVM_AUTOCONF += --enable-tracefnlz > +JAMVM_CONF_OPT += --enable-tracefnlz > endif > > ifdef PTXCONF_JAMVM_TRACE_DLL > -JAMVM_AUTOCONF += --enable-tracedll > +JAMVM_CONF_OPT += --enable-tracedll > endif > > ifdef PTXCONF_JAMVM_TRACE_LOCK > -JAMVM_AUTOCONF += --enable-tracelock > +JAMVM_CONF_OPT += --enable-tracelock > endif > > ifdef PTXCONF_JAMVM_TRACE_THREAD > -JAMVM_AUTOCONF += --enable-tracethread > +JAMVM_CONF_OPT += --enable-tracethread > endif > > ifdef PTXCONF_JAMVM_TRACE_DIRECT > -JAMVM_AUTOCONF += --enable-tracedirect > +JAMVM_CONF_OPT += --enable-tracedirect > endif > > ifdef PTXCONF_JAMVM_TRACE_INLINING > -JAMVM_AUTOCONF += --enable-traceinlining > +JAMVM_CONF_OPT += --enable-traceinlining > endif > > # FIXME: > diff --git a/rules/jed.make b/rules/jed.make > index 8c2d981135d4..07f9c19f1c62 100644 > --- a/rules/jed.make > +++ b/rules/jed.make > @@ -32,14 +32,15 @@ JED_LICENSE_FILES := \ > # Prepare > # ---------------------------------------------------------------------------- > > -JED_ENV := \ > +JED_CONF_ENV := \ > $(CROSS_ENV) \ > JED_ROOT=/usr/share/jed > > # > # autoconf > # > -JED_AUTOCONF := \ > +JED_CONF_TOOL := autoconf > +JED_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-slang=$(SYSROOT)/usr \ > --without-x > diff --git a/rules/joe.make b/rules/joe.make > index 5ebc96b79a3c..235f1fcaac9a 100644 > --- a/rules/joe.make > +++ b/rules/joe.make > @@ -32,7 +32,8 @@ JOE_LICENSE_FILES := file://COPYING;md5=da10ed7cf8038981c580e11c1d3e8fb6 > # > # autoconf > # > -JOE_AUTOCONF := \ > +JOE_CONF_TOOL := autoconf > +JOE_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-curses > > diff --git a/rules/kexec-tools.make b/rules/kexec-tools.make > index feb21f3f2537..71e124f07b0f 100644 > --- a/rules/kexec-tools.make > +++ b/rules/kexec-tools.make > @@ -38,7 +38,8 @@ endif > # autoconf > # > # Note: --without-gamecube is explicitly omitted. The option is broken. > -KEXEC_TOOLS_AUTOCONF := \ > +KEXEC_TOOLS_CONF_TOOL := autoconf > +KEXEC_TOOLS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --$(call ptx/wwo, PTXCONF_KEXEC_TOOLS_ZLIB)-zlib \ > --without-lzma \ > diff --git a/rules/libassuan.make b/rules/libassuan.make > index 0774d40956a4..f7cbd9b8674f 100644 > --- a/rules/libassuan.make > +++ b/rules/libassuan.make > @@ -32,7 +32,8 @@ LIBASSUAN_LICENSE_FILES := \ > # > # autoconf > # > -LIBASSUAN_AUTOCONF := \ > +LIBASSUAN_CONF_TOOL := autoconf > +LIBASSUAN_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-build-timestamp="$(PTXDIST_BUILD_TIMESTAMP)" \ > --disable-doc > diff --git a/rules/libcaca.make b/rules/libcaca.make > index d052aa2f7c91..bc1db52f414d 100644 > --- a/rules/libcaca.make > +++ b/rules/libcaca.make > @@ -26,16 +26,16 @@ LIBCACA_DIR := $(BUILDDIR)/$(LIBCACA) > # Prepare > # ---------------------------------------------------------------------------- > > -LIBCACA_ENV := \ > +LIBCACA_CONF_ENV := \ > $(CROSS_ENV) \ > CONFIG_SHELL=bash > > # > # autoconf > # > -LIBCACA_AUTOCONF := \ > +LIBCACA_CONF_TOOL := autoconf > +LIBCACA_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > - \ > --disable-doc \ > --disable-slang \ > --disable-conio \ > @@ -49,7 +49,6 @@ LIBCACA_AUTOCONF := \ > --disable-plugins \ > --disable-cppunit \ > --disable-zzuf \ > - \ > --$(call ptx/endis, PTXCONF_LIBCACA_NCURSES)-ncurses \ > --$(call ptx/endis, PTXCONF_LIBCACA_X11)-x11 \ > --disable-gl \ > diff --git a/rules/libcgi.make b/rules/libcgi.make > index f6cb325a4844..eb9d704d2675 100644 > --- a/rules/libcgi.make > +++ b/rules/libcgi.make > @@ -31,7 +31,8 @@ LIBCGI_LICENSE := LGPL-2.1-only > # > # autoconf > # > -LIBCGI_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LIBCGI_CONF_TOOL := autoconf > +LIBCGI_CONF_OPT := $(CROSS_AUTOCONF_USR) > > LIBCGI_MAKEVARS := $(CROSS_ENV_CC) $(CROSS_ENV_AR) > > diff --git a/rules/libcgicc.make b/rules/libcgicc.make > index b47401b575a7..137862343dd3 100644 > --- a/rules/libcgicc.make > +++ b/rules/libcgicc.make > @@ -35,7 +35,8 @@ LIBCGICC_LICENSE_FILES := \ > # > # autoconf > # > -LIBCGICC_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LIBCGICC_CONF_TOOL := autoconf > +LIBCGICC_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/libconfuse.make b/rules/libconfuse.make > index 9218519cdeca..93ca3c8f63a7 100644 > --- a/rules/libconfuse.make > +++ b/rules/libconfuse.make > @@ -30,15 +30,16 @@ LIBCONFUSE_LICENSE := ISC > # > # autoconf > # > -LIBCONFUSE_AUTOCONF := \ > +LIBCONFUSE_CONF_TOOL := autoconf > +LIBCONFUSE_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-examples \ > --disable-nls > > ifdef PTXCONF_LIBCONFUSE_STATIC > -LIBCONFUSE_AUTOCONF += --enable-shared=no > +LIBCONFUSE_CONF_OPT += --enable-shared=no > else > -LIBCONFUSE_AUTOCONF += --enable-shared > +LIBCONFUSE_CONF_OPT += --enable-shared > endif > > # ---------------------------------------------------------------------------- > diff --git a/rules/libdaemon.make b/rules/libdaemon.make > index b03c39c02dda..8e81b355500d 100644 > --- a/rules/libdaemon.make > +++ b/rules/libdaemon.make > @@ -31,7 +31,8 @@ LIBDAEMON_LICENSE := LGPL-2.1-or-later > # > # autoconf > # > -LIBDAEMON_AUTOCONF := \ > +LIBDAEMON_CONF_TOOL := autoconf > +LIBDAEMON_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-lynx > > diff --git a/rules/libfsl-vpu.make b/rules/libfsl-vpu.make > index 24a770866078..fd40ce9fbe0e 100644 > --- a/rules/libfsl-vpu.make > +++ b/rules/libfsl-vpu.make > @@ -31,7 +31,8 @@ LIBFSL_VPU_LICENSE_FILES := file://src/vpu_lib.c;md5=58db5f82e0a28dfe42bf9885eb4 > # > # autoconf > # > -LIBFSL_VPU_AUTOCONF := \ > +LIBFSL_VPU_CONF_TOOL := autoconf > +LIBFSL_VPU_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-debug > > diff --git a/rules/libftdi.make b/rules/libftdi.make > index a5cd79840fb9..a307f56642f9 100644 > --- a/rules/libftdi.make > +++ b/rules/libftdi.make > @@ -31,18 +31,19 @@ LIBFTDI_LICENSE := LGPL-2.1-only > # > # autoconf > # > -LIBFTDI_AUTOCONF := \ > +LIBFTDI_CONF_TOOL := autoconf > +LIBFTDI_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-shared \ > --disable-static \ > --disable-python-binding > > ifdef PTXCONF_LIBFTDI_CPP_WRAPPER > -LIBFTDI_AUTOCONF += \ > +LIBFTDI_CONF_OPT += \ > --enable-libftdipp \ > --with-boost=$(SYSROOT)/usr > else > -LIBFTDI_AUTOCONF += \ > +LIBFTDI_CONF_OPT += \ > --disable-libftdipp \ > --without-boost > endif > diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make > index 72e12102f6f3..126d0199445d 100644 > --- a/rules/libgcrypt.make > +++ b/rules/libgcrypt.make > @@ -36,18 +36,19 @@ ifneq ($(PTXCONF_ARCH_M68K)$(PTXCONF_ARCH_PPC),) > LIBGCRYPT_ASM := > endif > > -LIBGCRYPT_ENV := \ > +LIBGCRYPT_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_path_GPGRT_CONFIG=$(PTXDIST_SYSROOT_CROSS)/bin/gpgrt-config > > ifdef PTXCONF_ARCH_X86 > -LIBGCRYPT_ENV += ac_cv_sys_symbol_underscore=no > +LIBGCRYPT_CONF_ENV += ac_cv_sys_symbol_underscore=no > endif > > # > # autoconf > # > -LIBGCRYPT_AUTOCONF := \ > +LIBGCRYPT_CONF_TOOL := autoconf > +LIBGCRYPT_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-static \ > --enable-shared \ > diff --git a/rules/libgd.make b/rules/libgd.make > index 669e39bcd78b..5dba4205e544 100644 > --- a/rules/libgd.make > +++ b/rules/libgd.make > @@ -31,7 +31,8 @@ LIBGD_LICENSE_FILES := file://COPYING;md5=07384b3aa2e0d39afca0d6c40286f545 > # > # autoconf > # > -LIBGD_AUTOCONF := \ > +LIBGD_CONF_TOOL := autoconf > +LIBGD_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-rpath \ > --disable-werror \ > diff --git a/rules/libgsloop.make b/rules/libgsloop.make > index 14c68c077f9c..7cb8a5258683 100644 > --- a/rules/libgsloop.make > +++ b/rules/libgsloop.make > @@ -29,7 +29,8 @@ LIBGSLOOP_DIR := $(BUILDDIR)/$(LIBGSLOOP) > # > # autoconf > # > -LIBGSLOOP_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LIBGSLOOP_CONF_TOOL := autoconf > +LIBGSLOOP_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/libid3tag.make b/rules/libid3tag.make > index 04eb89bc9ec5..7ce83647a93b 100644 > --- a/rules/libid3tag.make > +++ b/rules/libid3tag.make > @@ -33,7 +33,8 @@ LIBID3TAG_LICENSE_FILES := \ > # > # autoconf > # > -LIBID3TAG_AUTOCONF := \ > +LIBID3TAG_CONF_TOOL := autoconf > +LIBID3TAG_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-debugging \ > --disable-profiling > diff --git a/rules/libiodbc.make b/rules/libiodbc.make > index fd58aa309b57..1c6df5caad8b 100644 > --- a/rules/libiodbc.make > +++ b/rules/libiodbc.make > @@ -33,7 +33,8 @@ LIBIODBC_MAKE_PAR := NO > # > # autoconf > # > -LIBIODBC_AUTOCONF := \ > +LIBIODBC_CONF_TOOL := autoconf > +LIBIODBC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-libodbc \ > --enable-pthreads \ > diff --git a/rules/libksba.make b/rules/libksba.make > index 8503fa6cad2d..631cb826f80a 100644 > --- a/rules/libksba.make > +++ b/rules/libksba.make > @@ -36,7 +36,8 @@ LIBKSBA_LICENSE_FILES := \ > # > # autoconf > # > -LIBKSBA_AUTOCONF := \ > +LIBKSBA_CONF_TOOL := autoconf > +LIBKSBA_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-gcov \ > --enable-build-timestamp="$(PTXDIST_BUILD_TIMESTAMP)" \ > diff --git a/rules/liblist.make b/rules/liblist.make > index f016ac84a43f..b47240872ea3 100644 > --- a/rules/liblist.make > +++ b/rules/liblist.make > @@ -32,7 +32,8 @@ LIBLIST_LICENSE_FILES := file://src/list.c;startline=10;endline=22;md5=5ace59915 > # > # autoconf > # > -LIBLIST_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LIBLIST_CONF_TOOL := autoconf > +LIBLIST_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/liblockfile.make b/rules/liblockfile.make > index 0022c33202ac..162ec491b0fe 100644 > --- a/rules/liblockfile.make > +++ b/rules/liblockfile.make > @@ -35,7 +35,8 @@ LIBLOCKFILE_MAKEVARS := ROOT=$(PKGDIR)/$(LIBLOCKFILE) $(CROSS_ENV_AR) > # > # autoconf > # > -LIBLOCKFILE_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LIBLOCKFILE_CONF_TOOL := autoconf > +LIBLOCKFILE_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/libltdl.make b/rules/libltdl.make > index 2f17f392f3e2..aa83dab8544c 100644 > --- a/rules/libltdl.make > +++ b/rules/libltdl.make > @@ -30,12 +30,13 @@ LIBLTDL_LICENSE_FILES := \ > # Prepare > # ---------------------------------------------------------------------------- > > -LIBLTDL_ENV := $(CROSS_ENV) HELP2MAN=: > +LIBLTDL_CONF_ENV := $(CROSS_ENV) HELP2MAN=: > > # > # autoconf > # > -LIBLTDL_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LIBLTDL_CONF_TOOL := autoconf > +LIBLTDL_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/liblzo.make b/rules/liblzo.make > index 928e189470a7..15bd6bd499ce 100644 > --- a/rules/liblzo.make > +++ b/rules/liblzo.make > @@ -31,7 +31,8 @@ LIBLZO_LICENSE := GPL-2.0-or-later > # > # autoconf > # > -LIBLZO_AUTOCONF := \ > +LIBLZO_CONF_TOOL := autoconf > +LIBLZO_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-shared \ > --disable-static > diff --git a/rules/libmad.make b/rules/libmad.make > index c07959187029..f0bf8d0902b8 100644 > --- a/rules/libmad.make > +++ b/rules/libmad.make > @@ -30,17 +30,18 @@ LIBMAD_LICENSE := GPL-2.0-or-later > # > # autoconf > # > -LIBMAD_AUTOCONF := \ > +LIBMAD_CONF_TOOL := autoconf > +LIBMAD_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-debugging \ > --disable-profiling \ > --disable-experimental > > ifdef PTXCONF_LIBMAD__OPT_SPEED > -LIBMAD_AUTOCONF += --enable-speed > +LIBMAD_CONF_OPT += --enable-speed > endif > ifdef PTXCONF_LIBMAD__OPT_ACCURACY > -LIBMAD_AUTOCONF += --enable-accuracy > +LIBMAD_CONF_OPT += --enable-accuracy > endif > > # ---------------------------------------------------------------------------- > diff --git a/rules/libmemcache.make b/rules/libmemcache.make > index ac461f6e81aa..dc4680e24be7 100644 > --- a/rules/libmemcache.make > +++ b/rules/libmemcache.make > @@ -26,7 +26,7 @@ LIBMEMCACHE_DIR := $(BUILDDIR)/$(LIBMEMCACHE) > # Prepare > # ---------------------------------------------------------------------------- > > -LIBMEMCACHE_ENV := \ > +LIBMEMCACHE_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_setsockopt_SO_RCVTIMEO=no \ > ac_cv_setsockopt_SO_SNDTIMEO=no > @@ -34,9 +34,10 @@ LIBMEMCACHE_ENV := \ > # > # autoconf > # > -LIBMEMCACHE_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LIBMEMCACHE_CONF_TOOL := autoconf > +LIBMEMCACHE_CONF_OPT := $(CROSS_AUTOCONF_USR) > > -LIBMEMCACHE_CFLAGS := -D_XOPEN_SOURCE=600 > +LIBMEMCACHE_CFLAGS := -D_XOPEN_SOURCE=600 > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/libmemcached.make b/rules/libmemcached.make > index 41111d9226ec..4eafc5caeb46 100644 > --- a/rules/libmemcached.make > +++ b/rules/libmemcached.make > @@ -28,17 +28,17 @@ LIBMEMCACHED_LICENSE_FILES := file://COPYING;md5=0b0ea33346dc4b11e1f4d1d7a698201 > # Prepare > # ---------------------------------------------------------------------------- > > -LIBMEMCACHED_ENV := \ > - $(CROSS_ENV) > - > -#We have libevent but disable it so clients/memslap doesn't build. > -#It fails to link because __sync_fetch_and_sub_4 is missing. > -LIBMEMCACHED_ENV += ac_cv_libevent=no > +# We have libevent but disable it so clients/memslap doesn't build. > +# It fails to link because __sync_fetch_and_sub_4 is missing. > +LIBMEMCACHED_CONF_ENV := \ > + $(CROSS_ENV) \ > + ac_cv_libevent=no > > # > # autoconf > # > -LIBMEMCACHED_AUTOCONF := \ > +LIBMEMCACHED_CONF_TOOL := autoconf > +LIBMEMCACHED_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-fat-binaries \ > --disable-64bit \ > @@ -62,6 +62,7 @@ LIBMEMCACHED_AUTOCONF := \ > --without-debug \ > --without-memcached \ > --without-docs > + > # ---------------------------------------------------------------------------- > # Target-Install > # ---------------------------------------------------------------------------- > diff --git a/rules/libmng.make b/rules/libmng.make > index c14e825849f6..37f9c37c616c 100644 > --- a/rules/libmng.make > +++ b/rules/libmng.make > @@ -31,7 +31,8 @@ LIBMNG_LICENSE_FILES := file://LICENSE;md5=32becdb8930f90eab219a8021130ec09 > # > # autoconf > # > -LIBMNG_AUTOCONF := \ > +LIBMNG_CONF_TOOL := autoconf > +LIBMNG_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-jpeg \ > --$(call ptx/wwo, PTXCONF_LIBMNG_LCMS)-lcms > diff --git a/rules/liboop.make b/rules/liboop.make > index b0a728cbed10..1e90f821e4cf 100644 > --- a/rules/liboop.make > +++ b/rules/liboop.make > @@ -29,7 +29,8 @@ LIBOOP_DIR := $(BUILDDIR)/$(LIBOOP) > # > # autoconf > # > -LIBOOP_AUTOCONF := \ > +LIBOOP_CONF_TOOL := autoconf > +LIBOOP_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-shared \ > --enable-static \ > diff --git a/rules/libpthread-stubs.make b/rules/libpthread-stubs.make > index de958731598e..4dc8b28e676a 100644 > --- a/rules/libpthread-stubs.make > +++ b/rules/libpthread-stubs.make > @@ -30,8 +30,8 @@ LIBPTHREAD_STUBS_LICENSE := MIT > # > # autoconf > # > -LIBPTHREAD_STUBS_AUTOCONF := \ > - $(CROSS_AUTOCONF_USR) > +LIBPTHREAD_CONF_TOOL := autoconf > +LIBPTHREAD_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/librn.make b/rules/librn.make > index ab75ab44b9d2..1bd382560518 100644 > --- a/rules/librn.make > +++ b/rules/librn.make > @@ -30,7 +30,8 @@ LIBRN_DIR := $(BUILDDIR)/$(LIBRN) > # > # autoconf > # > -LIBRN_AUTOCONF := \ > +LIBRN_CONF_TOOL := autoconf > +LIBRN_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-debug > > diff --git a/rules/librsvg.make b/rules/librsvg.make > index b140ecbc9525..e154dd34ff70 100644 > --- a/rules/librsvg.make > +++ b/rules/librsvg.make > @@ -30,7 +30,8 @@ LIBRSVG_DIR := $(BUILDDIR)/$(LIBRSVG) > # > # autoconf > # > -LIBRSVG_AUTOCONF := \ > +LIBRSVG_CONF_TOOL := autoconf > +LIBRSVG_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-gtk-theme \ > --$(call ptx/endis, PTXCONF_LIBRSVG_PIXBUF_LOADER)-pixbuf-loader \ > diff --git a/rules/libsigcpp.make b/rules/libsigcpp.make > index a6ac668e21db..db02f33d8d0e 100644 > --- a/rules/libsigcpp.make > +++ b/rules/libsigcpp.make > @@ -30,7 +30,8 @@ LIBSIGCPP_DIR := $(BUILDDIR)/$(LIBSIGCPP) > # > # autoconf > # > -LIBSIGCPP_AUTOCONF := \ > +LIBSIGCPP_CONF_TOOL := autoconf > +LIBSIGCPP_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-documentation > > diff --git a/rules/libsocketcan.make b/rules/libsocketcan.make > index 957d5a05c85f..6704f0849e17 100644 > --- a/rules/libsocketcan.make > +++ b/rules/libsocketcan.make > @@ -31,7 +31,8 @@ LIBSOCKETCAN_LICENSE_FILES := file://LICENSE;md5=4fbd65380cdd255951079008b364516 > # > # autoconf > # > -LIBSOCKETCAN_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LIBSOCKETCAN_CONF_TOOL := autoconf > +LIBSOCKETCAN_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/libssh2.make b/rules/libssh2.make > index 1e1bf9a4fd72..ef04cc01dc57 100644 > --- a/rules/libssh2.make > +++ b/rules/libssh2.make > @@ -29,7 +29,8 @@ LIBSSH2_DIR := $(BUILDDIR)/$(LIBSSH2) > # > # autoconf > # > -LIBSSH2_AUTOCONF := \ > +LIBSSH2_CONF_TOOL := autoconf > +LIBSSH2_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --disable-rpath \ > @@ -46,7 +47,6 @@ LIBSSH2_AUTOCONF := \ > --with-libssl-prefix=$(SYSROOT)/usr \ > --with-libz-prefix=$(SYSROOT)/usr > > - > # ---------------------------------------------------------------------------- > # Target-Install > # ---------------------------------------------------------------------------- > diff --git a/rules/libsysfs.make b/rules/libsysfs.make > index d2183e25d48f..3373eb6b993f 100644 > --- a/rules/libsysfs.make > +++ b/rules/libsysfs.make > @@ -33,7 +33,8 @@ LIBSYSFS_LICENSE_FILES := \ > # > # autoconf > # > -LIBSYSFS_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LIBSYSFS_CONF_TOOL := autoconf > +LIBSYSFS_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/libucdaemon.make b/rules/libucdaemon.make > index 123e4dc328a0..d56d035e4136 100644 > --- a/rules/libucdaemon.make > +++ b/rules/libucdaemon.make > @@ -29,7 +29,8 @@ LIBUCDAEMON_DIR := $(BUILDDIR)/$(LIBUCDAEMON) > # > # autoconf > # > -LIBUCDAEMON_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LIBUCDAEMON_CONF_TOOL := autoconf > +LIBUCDAEMON_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/libusb-compat.make b/rules/libusb-compat.make > index 2add4bfb29b5..0b9daddd9c4c 100644 > --- a/rules/libusb-compat.make > +++ b/rules/libusb-compat.make > @@ -30,7 +30,8 @@ LIBUSB_COMPAT_LICENSE := LGPL-2.1-only > # > # autoconf > # > -LIBUSB_COMPAT_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LIBUSB_COMPAT_CONF_TOOL := autoconf > +LIBUSB_COMPAT_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/libusb.make b/rules/libusb.make > index 50e5c6333119..1a8c1ea43580 100644 > --- a/rules/libusb.make > +++ b/rules/libusb.make > @@ -33,7 +33,8 @@ LIBUSB_LICENSE_FILES := \ > # > # autoconf > # > -LIBUSB_AUTOCONF := \ > +LIBUSB_CONF_TOOL := autoconf > +LIBUSB_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-shared \ > --disable-static \ > diff --git a/rules/libxml2.make b/rules/libxml2.make > index fcdf853fae52..be6e9d60a279 100644 > --- a/rules/libxml2.make > +++ b/rules/libxml2.make > @@ -38,7 +38,8 @@ LIBXML2_URL := \ > # > # autoconf > # > -LIBXML2_AUTOCONF := \ > +LIBXML2_CONF_TOOL := autoconf > +LIBXML2_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-static \ > $(GLOBAL_IPV6_OPTION) \ > @@ -80,15 +81,15 @@ LIBXML2_AUTOCONF := \ > > ifdef PTXCONF_ICONV > # --with-iconv=yes -> does the right thing for libc-iconv > -LIBXML2_AUTOCONF += --with-iconv=yes > +LIBXML2_CONF_OPT += --with-iconv=yes > else > -LIBXML2_AUTOCONF += --with-iconv=no > +LIBXML2_CONF_OPT += --with-iconv=no > endif > > ifdef PTXCONF_LIBXML2_ZLIB > -LIBXML2_AUTOCONF += --with-zlib=$(SYSROOT)/usr > +LIBXML2_CONF_OPT += --with-zlib=$(SYSROOT)/usr > else > -LIBXML2_AUTOCONF += --without-zlib > +LIBXML2_CONF_OPT += --without-zlib > endif > > # ---------------------------------------------------------------------------- > diff --git a/rules/libxmlconfig.make b/rules/libxmlconfig.make > index 71da9799d02f..53315abb4109 100644 > --- a/rules/libxmlconfig.make > +++ b/rules/libxmlconfig.make > @@ -31,7 +31,8 @@ LIBXMLCONFIG_DIR := $(BUILDDIR)/$(LIBXMLCONFIG) > # > # autoconf > # > -LIBXMLCONFIG_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LIBXMLCONFIG_CONF_TOOL := autoconf > +LIBXMLCONFIG_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/libxslt.make b/rules/libxslt.make > index 1ffe657a29df..4b5da2c4aa41 100644 > --- a/rules/libxslt.make > +++ b/rules/libxslt.make > @@ -33,14 +33,15 @@ LIBXSLT_URL := \ > # Prepare > # ---------------------------------------------------------------------------- > > -LIBXSLT_ENV := \ > +LIBXSLT_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_path_XML_CONFIG=xml2-config > > # > # autoconf > # > -LIBXSLT_AUTOCONF := \ > +LIBXSLT_CONF_TOOL := autoconf > +LIBXSLT_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-rebuild-docs \ > --disable-static \ > diff --git a/rules/links.make b/rules/links.make > index 8328af12ff7f..4d5049ef8de5 100644 > --- a/rules/links.make > +++ b/rules/links.make > @@ -27,7 +27,8 @@ LINKS_DIR := $(BUILDDIR)/$(LINKS) > # > # autoconf > # > -LINKS_AUTOCONF := \ > +LINKS_CONF_TOOL := autoconf > +LINKS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --$(call ptx/wwo, PTXCONF_LINKS_SSL)-ssl \ > --without-gpm \ > @@ -43,14 +44,16 @@ LINKS_AUTOCONF := \ > --$(call ptx/wwo, PTXCONF_LINKS_LZMA)-lzma \ > > ifneq ($(PTXCONF_LINKS_X),) > -LINKS_AUTOCONF += --enable-graphics > +LINKS_CONF_OPT += --enable-graphics > else > -LINKS_AUTOCONF += --disable-graphics > +LINKS_CONF_OPT += --disable-graphics > endif > > # Note: ./configure only support 'gpm' features auto-detection, so > # we use the autoconf trick (see Gentoo ebuild) > -LINKS_ENV += ac_cv_lib_gpm_Gpm_Open=no > +LINKS_CONF_ENV := \ > + $(CROSS_ENV) \ > + ac_cv_lib_gpm_Gpm_Open=no > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/lsuio.make b/rules/lsuio.make > index 1f193bdd9851..5bba1491ccf2 100644 > --- a/rules/lsuio.make > +++ b/rules/lsuio.make > @@ -31,7 +31,8 @@ LSUIO_LICENSE_FILES := file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f > # > # autoconf > # > -LSUIO_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LSUIO_CONF_TOOL := autoconf > +LSUIO_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/ltt-control.make b/rules/ltt-control.make > index b0ab66d49339..2b51ecab547a 100644 > --- a/rules/ltt-control.make > +++ b/rules/ltt-control.make > @@ -30,7 +30,8 @@ LTT_CONTROL_DIR := $(BUILDDIR)/$(LTT_CONTROL) > # > # autoconf > # > -LTT_CONTROL_AUTOCONF := $(CROSS_AUTOCONF_USR) > +LTT_CONTROL_CONF_TOOL := autoconf > +LTT_CONTROL_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/madplay.make b/rules/madplay.make > index 4e6589780dd7..7f9c97d8249b 100644 > --- a/rules/madplay.make > +++ b/rules/madplay.make > @@ -31,7 +31,9 @@ MADPLAY_DIR := $(BUILDDIR)/$(MADPLAY) > # > # autoconf > # > -MADPLAY_AUTOCONF := $(CROSS_AUTOCONF_USR) \ > +MADPLAY_CONF_TOOL := autoconf > +MADPLAY_CONF_OPT := \ > + $(CROSS_AUTOCONF_USR) \ > --disable-debugging \ > --disable-profiling \ > --disable-nls \ > diff --git a/rules/memedit.make b/rules/memedit.make > index 07e199633ea6..93fc938cb3f2 100644 > --- a/rules/memedit.make > +++ b/rules/memedit.make > @@ -32,7 +32,8 @@ MEMEDIT_DIR := $(BUILDDIR)/$(MEMEDIT) > # > # autoconf > # > -MEMEDIT_AUTOCONF := $(CROSS_AUTOCONF_USR) > +MEMEDIT_CONF_TOOL := autoconf > +MEMEDIT_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make > index 41cde06dbe0b..eb8811b24491 100644 > --- a/rules/module-init-tools.make > +++ b/rules/module-init-tools.make > @@ -33,7 +33,8 @@ MODULE_INIT_TOOLS_MAKEVARS := MAN5="" MAN8="" > # > # autoconf > # > -MODULE_INIT_TOOLS_AUTOCONF := $(CROSS_AUTOCONF_USR) > +MODULE_INIT_TOOLS_CONF_TOOL := autoconf > +MODULE_INIT_TOOLS_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/mtr.make b/rules/mtr.make > index abba438cb962..040a41046e97 100644 > --- a/rules/mtr.make > +++ b/rules/mtr.make > @@ -30,7 +30,8 @@ MTR_LICENSE := GPL-2.0-or-later > # > # autoconf > # > -MTR_AUTOCONF := \ > +MTR_CONF_TOOL := autoconf > +MTR_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_IPV6_OPTION) \ > --without-gtk > diff --git a/rules/net-snmp.make b/rules/net-snmp.make > index 1a57da3a35fe..5c5463a56127 100644 > --- a/rules/net-snmp.make > +++ b/rules/net-snmp.make > @@ -39,19 +39,20 @@ NET_SNMP_MIB_MODULES-$(PTXCONF_NET_SNMP_MIB_MODULES_UCD_SNMP) += ucd_snmp > NET_SNMP_MIB_MODULES-$(PTXCONF_NET_SNMP_MIB_MODULES_LM_SENSORS) += ucd-snmp/lmsensorsMib > > > -NET_SNMP_ENV := \ > +NET_SNMP_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_header_pcre_h=no > > ifndef PTXCONF_NET_SNMP_PCI > -NET_SNMP_ENV += \ > +NET_SNMP_CONF_ENV += \ > netsnmp_cv_func_pci_lookup_name_LMIBLIBS=no > endif > > # > # autoconf > # > -NET_SNMP_AUTOCONF := \ > +NET_SNMP_CONF_TOOL := autoconf > +NET_SNMP_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --$(call ptx/endis, PTXCONF_NET_SNMP_AGENT)-agent \ > --$(call ptx/endis, PTXCONF_NET_SNMP_APPLICATIONS)-applications \ > diff --git a/rules/netkit-ftp.make b/rules/netkit-ftp.make > index 8c0a109b6754..a6470ffc3311 100644 > --- a/rules/netkit-ftp.make > +++ b/rules/netkit-ftp.make > @@ -34,7 +34,8 @@ NETKIT_FTP_LICENSE := BSD > # > # autoconf > # > -NETKIT_FTP_AUTOCONF := $(CROSS_AUTOCONF_USR) > +NETKIT_FTP_CONF_TOOL := autoconf > +NETKIT_FTP_CONF_OPT := $(CROSS_AUTOCONF_USR) > > $(STATEDIR)/netkit-ftp.prepare: > @$(call targetinfo) > diff --git a/rules/npth.make b/rules/npth.make > index baa9ab3aabab..48b7501a5587 100644 > --- a/rules/npth.make > +++ b/rules/npth.make > @@ -34,7 +34,8 @@ NPTH_LICENSE_FILES := \ > # > # autoconf > # > -NPTH_AUTOCONF := \ > +NPTH_CONF_TOOL := autoconf > +NPTH_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-tests \ > --enable-build-timestamp="$(PTXDIST_BUILD_TIMESTAMP)" > diff --git a/rules/pangomm.make b/rules/pangomm.make > index 7ec4af3015d5..1203b0679a2a 100644 > --- a/rules/pangomm.make > +++ b/rules/pangomm.make > @@ -29,7 +29,8 @@ PANGOMM_DIR := $(BUILDDIR)/$(PANGOMM) > # > # autoconf > # > -PANGOMM_AUTOCONF := \ > +PANGOMM_CONF_TOOL := autoconf > +PANGOMM_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-documentation > > diff --git a/rules/pelts_tests.make b/rules/pelts_tests.make > index bb0eee3bfebd..77f646992c73 100644 > --- a/rules/pelts_tests.make > +++ b/rules/pelts_tests.make > @@ -30,7 +30,8 @@ PELTS_TESTS_DIR := $(BUILDDIR)/$(PELTS_TESTS) > # > # autoconf > # > -PELTS_TESTS_AUTOCONF := $(CROSS_AUTOCONF_USR) > +PELTS_TESTS_CONF_TOOL := autoconf > +PELTS_TESTS_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/php8.make b/rules/php8.make > index c65d0d192ae2..fe255361dd08 100644 > --- a/rules/php8.make > +++ b/rules/php8.make > @@ -43,7 +43,8 @@ PHP8_URL := \ > # > # autoconf > # > -PHP8_AUTOCONF := \ > +PHP8_CONF_TOOL := autoconf > +PHP8_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-rpath \ > --disable-re2c-cgoto \ > diff --git a/rules/pop3spam.make b/rules/pop3spam.make > index 90cf861d856b..34eb19726173 100644 > --- a/rules/pop3spam.make > +++ b/rules/pop3spam.make > @@ -31,7 +31,8 @@ POP3SPAM_DIR := $(BUILDDIR)/$(POP3SPAM) > # > # autoconf > # > -POP3SPAM_AUTOCONF := $(CROSS_AUTOCONF_USR) > +POP3SPAM_CONF_TOOL := autoconf > +POP3SPAM_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/prelink.make b/rules/prelink.make > index addcd8425dfe..4ee4c421f5ef 100644 > --- a/rules/prelink.make > +++ b/rules/prelink.make > @@ -31,7 +31,8 @@ PRELINK_LICENSE := GPL-2.0-only > # > # autoconf > # > -PRELINK_AUTOCONF := $(CROSS_AUTOCONF_USR) > +PRELINK_CONF_TOOL := autoconf > +PRELINK_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/ps3-utils.make b/rules/ps3-utils.make > index 92cd7c8b11dc..ad8842782351 100644 > --- a/rules/ps3-utils.make > +++ b/rules/ps3-utils.make > @@ -30,7 +30,8 @@ PS3_UTILS_DIR := $(BUILDDIR)/$(PS3_UTILS) > # > # autoconf > # > -PS3_UTILS_AUTOCONF := $(CROSS_AUTOCONF_USR) > +PS3_UTILS_CONF_TOOL := autoconf > +PS3_UTILS_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/pureftpd.make b/rules/pureftpd.make > index 229ceeb0ba11..8f447b5280f2 100644 > --- a/rules/pureftpd.make > +++ b/rules/pureftpd.make > @@ -30,7 +30,8 @@ PUREFTPD_DIR := $(BUILDDIR)/$(PUREFTPD) > # > # autoconf > # > -PUREFTPD_AUTOCONF := \ > +PUREFTPD_CONF_TOOL := autoconf > +PUREFTPD_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --without-dmalloc \ > --with-standalone \ > diff --git a/rules/pv.make b/rules/pv.make > index 2f319e7e8e1e..1c6d67b17029 100644 > --- a/rules/pv.make > +++ b/rules/pv.make > @@ -31,7 +31,8 @@ PV_MAKEVARS := $(CROSS_ENV_LD) > # > # autoconf > # > -PV_AUTOCONF := \ > +PV_CONF_TOOL := autoconf > +PV_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-nls \ > --disable-splice \ > diff --git a/rules/quota-tools.make b/rules/quota-tools.make > index 091da876b22d..553cad049516 100644 > --- a/rules/quota-tools.make > +++ b/rules/quota-tools.make > @@ -27,8 +27,7 @@ QUOTA_TOOLS_LICENSE := GPL-2.0-only > # autoconf > # > QUOTA_TOOLS_CONF_TOOL := autoconf > - > -QUOTA_TOOLS_AUTOCONF := \ > +QUOTA_TOOLS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --disable-nls \ > diff --git a/rules/readline.make b/rules/readline.make > index a729cf43266e..4d2512752d21 100644 > --- a/rules/readline.make > +++ b/rules/readline.make > @@ -29,7 +29,8 @@ READLINE_LICENSE_FILES := file://COPYING;md5=d32239bcb673463ab874e80d47fae504 > # Prepare > # ---------------------------------------------------------------------------- > > -READLINE_AUTOCONF := \ > +READLINE_CONF_TOOL := autoconf > +READLINE_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-multibyte \ > --enable-shared \ > diff --git a/rules/rsync.make b/rules/rsync.make > index 5320980acc83..b59d4d549367 100644 > --- a/rules/rsync.make > +++ b/rules/rsync.make > @@ -26,14 +26,15 @@ RSYNC_DIR := $(BUILDDIR)/$(RSYNC) > # Prepare > # ---------------------------------------------------------------------------- > > -RSYNC_ENV := \ > +RSYNC_CONF_ENV := \ > $(CROSS_ENV) \ > rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes > > # > # autoconf > # > -RSYNC_AUTOCONF := \ > +RSYNC_CONF_TOOL := autoconf > +RSYNC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_IPV6_OPTION) \ > $(GLOBAL_LARGE_FILE_OPTION) \ > @@ -43,7 +44,7 @@ RSYNC_AUTOCONF := \ > --disable-locale > > ifneq ($(call remove_quotes,$(PTXCONF_RSYNC_CONFIG_FILE)),) > -RSYNC_AUTOCONF += --with-rsyncd-conf=$(PTXCONF_RSYNC_CONFIG_FILE) > +RSYNC_CONF_OPT += --with-rsyncd-conf=$(PTXCONF_RSYNC_CONFIG_FILE) > endif > > # ---------------------------------------------------------------------------- > diff --git a/rules/rsync3.make b/rules/rsync3.make > index ec6b83f658e5..b807b991a0a4 100644 > --- a/rules/rsync3.make > +++ b/rules/rsync3.make > @@ -34,7 +34,8 @@ RSYNC3_CONF_ENV := \ > # > # autoconf > # > -RSYNC3_AUTOCONF := \ > +RSYNC3_CONF_TOOL := autoconf > +RSYNC3_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-debug \ > --disable-profile \ > diff --git a/rules/screen.make b/rules/screen.make > index 3e7c79881479..385969525b00 100644 > --- a/rules/screen.make > +++ b/rules/screen.make > @@ -30,7 +30,8 @@ SCREEN_LICENSE := GPL-2.0-or-later > # > # autoconf > # > -SCREEN_AUTOCONF := \ > +SCREEN_CONF_TOOL := autoconf > +SCREEN_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-use-locale \ > --with-sys-screenrc=/etc/screenrc > diff --git a/rules/sdl-gfx.make b/rules/sdl-gfx.make > index 0dd16123b9d6..ef6d5bc65315 100644 > --- a/rules/sdl-gfx.make > +++ b/rules/sdl-gfx.make > @@ -29,7 +29,8 @@ SDL_GFX_DIR := $(BUILDDIR)/$(SDL_GFX) > # > # autoconf > # > -SDL_GFX_AUTOCONF := \ > +SDL_GFX_CONF_TOOL := autoconf > +SDL_GFX_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-sdl-prefix=$(SYSROOT)/usr \ > --disable-mmx \ > diff --git a/rules/sdl-ttf.make b/rules/sdl-ttf.make > index 8eefb66d28e8..2fcae7cd9c83 100644 > --- a/rules/sdl-ttf.make > +++ b/rules/sdl-ttf.make > @@ -27,14 +27,15 @@ SDL_TTF_LICENSE := zlib > # Prepare > # ---------------------------------------------------------------------------- > > -SDL_TTF_ENV := \ > +SDL_TTF_CONF_ENV := \ > $(CROSS_ENV) \ > sdl_cv_lib_opengl=no > > # > # autoconf > # > -SDL_TTF_AUTOCONF := \ > +SDL_TTF_CONF_TOOL := autoconf > +SDL_TTF_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-sdl-prefix=$(SYSROOT)/usr \ > --disable-sdltest \ > diff --git a/rules/sdl_image.make b/rules/sdl_image.make > index 405a9aac6acf..48ad7f056714 100644 > --- a/rules/sdl_image.make > +++ b/rules/sdl_image.make > @@ -30,7 +30,8 @@ SDL_IMAGE_LICENSE := LGPL-2.1-only > # > # autoconf > # > -SDL_IMAGE_AUTOCONF := \ > +SDL_IMAGE_CONF_TOOL := autoconf > +SDL_IMAGE_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-sdl-prefix=$(SYSROOT)/usr \ > --disable-sdltest \ > diff --git a/rules/sdl_mixer.make b/rules/sdl_mixer.make > index c2fcc8ba866e..8fb754deddcd 100644 > --- a/rules/sdl_mixer.make > +++ b/rules/sdl_mixer.make > @@ -31,57 +31,23 @@ SDL_MIXER_LICENSE := LGPL-2.1-only > # > # autoconf > # > -SDL_MIXER_AUTOCONF := \ > +SDL_MIXER_CONF_TOOL := autoconf > +SDL_MIXER_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-sdl-prefix=$(SYSROOT)/usr \ > - --disable-music-mp3 > - > -ifdef PTXCONF_SDL_MIXER_WAVE > -SDL_MIXER_AUTOCONF += --enable-music-wave > -else > -SDL_MIXER_AUTOCONF += --disable-music-wave > -endif > - > -ifdef PTXCONF_SDL_MIXER_MOD > -SDL_MIXER_AUTOCONF += --enable-music-mod > -else > -SDL_MIXER_AUTOCONF += --disable-music-mod > -endif > + --disable-music-mp3 \ > + --$(call ptx/endis, PTXCONF_SDL_MIXER_WAVE)-music-wave \ > + --$(call ptx/endis, PTXCONF_SDL_MIXER_MOD)-music-mod \ > + --$(call ptx/endis, PTXCONF_SDL_MIXER_MIDI_TIMIDITY)-music-timidity-midi \ > + --$(call ptx/endis, PTXCONF_SDL_MIXER_MIDI_NATIVE)-music-native-midi-gpl \ > + --$(call ptx/endis, PTXCONF_SDL_MIXER_OGG)-music-ogg \ > + --$(call ptx/endis, PTXCONF_SDL_MIXER_FLAC)-music-flac \ > + --$(call ptx/endis, PTXCONF_SDL_MIXER_MP3)-music-mp3-mad-gpl > > ifneq ($(PTXCONF_SDL_MIXER_MIDI_TIMIDITY)$(PTXCONF_SDL_MIXER_MIDI_NATIVE),) > -SDL_MIXER_AUTOCONF += --enable-music-midi > -else > -SDL_MIXER_AUTOCONF += --disable-music-midi > -endif > - > -ifdef PTXCONF_SDL_MIXER_MIDI_TIMIDITY > -SDL_MIXER_AUTOCONF += --enable-music-timidity-midi > -else > -SDL_MIXER_AUTOCONF += --disable-music-timidity-midi > -endif > - > -ifdef PTXCONF_SDL_MIXER_MIDI_NATIVE > -SDL_MIXER_AUTOCONF += --enable-music-native-midi-gpl > -else > -SDL_MIXER_AUTOCONF += --disable-music-native-midi-gpl > -endif > - > -ifdef PTXCONF_SDL_MIXER_OGG > -SDL_MIXER_AUTOCONF += --enable-music-ogg > -else > -SDL_MIXER_AUTOCONF += --disable-music-ogg > -endif > - > -ifdef PTXCONF_SDL_MIXER_FLAC > -SDL_MIXER_AUTOCONF += --enable-music-flac > -else > -SDL_MIXER_AUTOCONF += --disable-music-flac > -endif > - > -ifdef PTXCONF_SDL_MIXER_MP3 > -SDL_MIXER_AUTOCONF += --enable-music-mp3-mad-gpl > +SDL_MIXER_CONF_OPT += --enable-music-midi > else > -SDL_MIXER_AUTOCONF += --disable-music-mp3-mad-gpl > +SDL_MIXER_CONF_OPT += --disable-music-midi > endif > > # ---------------------------------------------------------------------------- > diff --git a/rules/sdparm.make b/rules/sdparm.make > index bca0802f9672..64aaa5ee72fe 100644 > --- a/rules/sdparm.make > +++ b/rules/sdparm.make > @@ -29,7 +29,8 @@ SDPARM_DIR := $(BUILDDIR)/$(SDPARM) > # > # autoconf > # > -SDPARM_AUTOCONF := $(CROSS_AUTOCONF_USR) > +SDPARM_CONF_TOOL := autoconf > +SDPARM_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/sed.make b/rules/sed.make > index 4e589598b2e6..1ab10350bb1f 100644 > --- a/rules/sed.make > +++ b/rules/sed.make > @@ -33,7 +33,8 @@ SED_LICENSE_FILES := \ > # > # autoconf > # > -SED_AUTOCONF := \ > +SED_CONF_TOOL := autoconf > +SED_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --disable-acl \ > diff --git a/rules/sparsehash.make b/rules/sparsehash.make > index d77cb8fbdd38..b53979504586 100644 > --- a/rules/sparsehash.make > +++ b/rules/sparsehash.make > @@ -22,7 +22,8 @@ SPARSEHASH_DIR := $(BUILDDIR)/$(SPARSEHASH) > # > # autoconf > # > -SPARSEHASH_AUTOCONF := $(CROSS_AUTOCONF_USR) > +SPARSEHASH_CONF_TOOL := autoconf > +SPARSEHASH_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/stunnel.make b/rules/stunnel.make > index 41518fcf4e5a..2d7d4ef2da9b 100644 > --- a/rules/stunnel.make > +++ b/rules/stunnel.make > @@ -33,7 +33,7 @@ STUNNEL_LICENSE := stunnel (GPL2 or later with openssl exception) > # autoconf > # > STUNNEL_CONF_TOOL := autoconf > -STUNNEL_AUTOCONF := \ > +STUNNEL_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_LARGE_FILE_OPTION) \ > $(GLOBAL_IPV6_OPTION) \ > diff --git a/rules/sudo.make b/rules/sudo.make > index dd344ee6a3ea..3ae7b559d549 100644 > --- a/rules/sudo.make > +++ b/rules/sudo.make > @@ -31,7 +31,7 @@ SUDO_LICENSE_FILES := file://doc/LICENSE;md5=fdff64d4fd19126330aa81b94d167173 > # Prepare > # ---------------------------------------------------------------------------- > > -SUDO_ENV := \ > +SUDO_CONF_ENV := \ > $(CROSS_ENV) \ > sudo_cv_func_fnmatch=yes \ > sudo_cv_func_unsetenv_void=no \ > @@ -41,7 +41,8 @@ SUDO_ENV := \ > # > # autoconf > # > -SUDO_AUTOCONF = \ > +SUDO_CONF_TOOL := autoconf > +SUDO_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-authentication \ > --disable-root-mailer \ > @@ -93,21 +94,21 @@ SUDO_AUTOCONF = \ > --without-pam > > ifdef PTXCONF_SUDO_USE_SENDMAIL > -SUDO_AUTOCONF += --with-sendmail > +SUDO_CONF_OPT += --with-sendmail > else > -SUDO_AUTOCONF += --without-sendmail > +SUDO_CONF_OPT += --without-sendmail > endif > > ifdef PTXCONF_SUDO_INSTALL_VISUDO > ifneq ($(PTXCONF_SUDO_DEFAULT_EDITOR),"") > -SUDO_AUTOCONF += --with-editor=$(PTXCONF_SUDO_DEFAULT_EDITOR) > +SUDO_CONF_OPT += --with-editor=$(PTXCONF_SUDO_DEFAULT_EDITOR) > endif > endif > > ifdef PTXCONF_SUDO_USE_ENV_EDITOR > -SUDO_AUTOCONF += --with-env-editor > +SUDO_CONF_OPT += --with-env-editor > else > -SUDO_AUTOCONF += --without-env-editor > +SUDO_CONF_OPT += --without-env-editor > endif > > # ---------------------------------------------------------------------------- > diff --git a/rules/supertux.make b/rules/supertux.make > index f569c1ae3ee7..b94153eb4fbc 100644 > --- a/rules/supertux.make > +++ b/rules/supertux.make > @@ -29,12 +29,13 @@ SUPERTUX_DIR := $(BUILDDIR)/$(SUPERTUX) > # > # autoconf > # > -SUPERTUX_AUTOCONF := \ > +SUPERTUX_CONF_TOOL := autoconf > +SUPERTUX_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-opengl \ > --with-sdl-prefix=$(SYSROOT)/usr > > -SUPERTUX_CXXFLAGS := -std=c++98 > +SUPERTUX_CXXFLAGS := -std=c++98 > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/syslogng.make b/rules/syslogng.make > index 8396fabcedc4..f1f917e84c9d 100644 > --- a/rules/syslogng.make > +++ b/rules/syslogng.make > @@ -30,7 +30,7 @@ SYSLOGNG_LICENSE := GPL-2.0-or-later AND LGPL-2.1-only > # Prepare > # ---------------------------------------------------------------------------- > > -SYSLOGNG_ENV = \ > +SYSLOGNG_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_lib_nsl_gethostbyname=no \ > am_cv_python_version=$(PYTHON3_MAJORMINOR) \ > @@ -39,7 +39,8 @@ SYSLOGNG_ENV = \ > # > # autoconf > # > -SYSLOGNG_AUTOCONF = \ > +SYSLOGNG_CONF_TOOL := autoconf > +SYSLOGNG_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --localstatedir=/var/run \ > --with-module-dir=/usr/$(CROSS_LIB_DIR)/syslog-ng \ > diff --git a/rules/termcap.make b/rules/termcap.make > index 5939cc1b6d48..3cc0f73b710e 100644 > --- a/rules/termcap.make > +++ b/rules/termcap.make > @@ -30,7 +30,8 @@ TERMCAP_LICENSE := GPL-2.0-only > # > # autoconf > # > -TERMCAP_AUTOCONF := \ > +TERMCAP_CONF_TOOL := autoconf > +TERMCAP_CONF_OPT := \ > --prefix= \ > $(CROSS_AUTOCONF_ARCH) \ > --enable-install-termcap > diff --git a/rules/urshd.make b/rules/urshd.make > index 90e12cc843f8..1dbca14c6bbd 100644 > --- a/rules/urshd.make > +++ b/rules/urshd.make > @@ -30,7 +30,8 @@ URSHD_LICENSE := BSD-4-Clause > # > # autoconf > # > -URSHD_AUTOCONF := $(CROSS_AUTOCONF_USR) > +URSHD_CONF_TOOL := autoconf > +URSHD_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/usbutils.make b/rules/usbutils.make > index 1cb1cf58c73d..9a44b5c6e69d 100644 > --- a/rules/usbutils.make > +++ b/rules/usbutils.make > @@ -31,7 +31,8 @@ USBUTILS_LICENSE := GPL-2.0-only > # > # autoconf > # > -USBUTILS_AUTOCONF := \ > +USBUTILS_CONF_TOOL := autoconf > +USBUTILS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_LARGE_FILE_OPTION) > > diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make > index aa99b063cba1..55d43b9b2f15 100644 > --- a/rules/wpa_supplicant.make > +++ b/rules/wpa_supplicant.make > @@ -40,7 +40,8 @@ WPA_SUPPLICANT_MAKE_ENV := \ > # > # autoconf > # > -WPA_SUPPLICANT_AUTOCONF := $(CROSS_AUTOCONF_USR) > +WPA_SUPPLICANT_CONF_TOOL := autoconf > +WPA_SUPPLICANT_CONF_OPT := $(CROSS_AUTOCONF_USR) > > $(STATEDIR)/wpa_supplicant.prepare: > @$(call targetinfo) > diff --git a/rules/xerces.make b/rules/xerces.make > index b20bd0df812c..f5a1b4749cb9 100644 > --- a/rules/xerces.make > +++ b/rules/xerces.make > @@ -30,7 +30,8 @@ XERCES_DIR := $(BUILDDIR)/$(XERCES) > # > # autoconf > # > -XERCES_AUTOCONF := $(CROSS_AUTOCONF_USR) > +XERCES_CONF_TOOL := autoconf > +XERCES_CONF_OPT := $(CROSS_AUTOCONF_USR) > > XERCES_SUBDIR := src/xercesc > > diff --git a/rules/xmlstarlet.make b/rules/xmlstarlet.make > index 5751452b7017..19d38fe5fca6 100644 > --- a/rules/xmlstarlet.make > +++ b/rules/xmlstarlet.make > @@ -32,7 +32,8 @@ XMLSTARLET_DIR := $(BUILDDIR)/$(XMLSTARLET) > # > # Don't set --with-libiconv-prefix (not necessary for libc-iconv) > # > -XMLSTARLET_AUTOCONF := \ > +XMLSTARLET_CONF_TOOL := autoconf > +XMLSTARLET_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-libxml-prefix=$(SYSROOT)/usr \ > --with-libxslt-prefix=$(SYSROOT)/usr \ > diff --git a/rules/xorg-app-rgb.make b/rules/xorg-app-rgb.make > index d1f3bce5dfdb..a68624da2efa 100644 > --- a/rules/xorg-app-rgb.make > +++ b/rules/xorg-app-rgb.make > @@ -31,7 +31,8 @@ XORG_APP_RGB_DIR := $(BUILDDIR)/$(XORG_APP_RGB) > # FIXME: importance of switch > # --with-rgb-db-type=(text|dbm|ndbm) rgb database type (default is text) > # > -XORG_APP_RGB_AUTOCONF := \ > +XORG_APP_RGB_CONF_TOOL := autoconf > +XORG_APP_RGB_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --datadir=$(XORG_DATADIR) > > diff --git a/rules/xorg-app-xeyes.make b/rules/xorg-app-xeyes.make > index 2b608fa75382..526aba99de16 100644 > --- a/rules/xorg-app-xeyes.make > +++ b/rules/xorg-app-xeyes.make > @@ -30,7 +30,8 @@ XORG_APP_XEYES_LICENSE := MIT > # > # autoconf > # > -XORG_APP_XEYES_AUTOCONF := \ > +XORG_APP_XEYES_CONF_TOOL := autoconf > +XORG_APP_XEYES_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --datadir=$(XORG_DATADIR) > > diff --git a/rules/xorg-app-xsetroot.make b/rules/xorg-app-xsetroot.make > index 0e4e8ecdcc90..7dee679fbc4c 100644 > --- a/rules/xorg-app-xsetroot.make > +++ b/rules/xorg-app-xsetroot.make > @@ -29,7 +29,8 @@ XORG_APP_XSETROOT_DIR := $(BUILDDIR)/$(XORG_APP_XSETROOT) > # > # autoconf > # > -XORG_APP_XSETROOT_AUTOCONF := \ > +XORG_APP_XSETROOT_CONF_TOOL := autoconf > +XORG_APP_XSETROOT_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --datadir=$(XORG_DATADIR) > > diff --git a/rules/xorg-app-xvinfo.make b/rules/xorg-app-xvinfo.make > index edea5b5cc99a..a7c9af46734f 100644 > --- a/rules/xorg-app-xvinfo.make > +++ b/rules/xorg-app-xvinfo.make > @@ -30,7 +30,8 @@ XORG_APP_XVINFO_DIR := $(BUILDDIR)/$(XORG_APP_XVINFO) > # > # autoconf > # > -XORG_APP_XVINFO_AUTOCONF := \ > +XORG_APP_XVINFO_CONF_TOOL := autoconf > +XORG_APP_XVINFO_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --datadir=$(XORG_DATADIR) > > diff --git a/rules/xorg-data-xbitmaps.make b/rules/xorg-data-xbitmaps.make > index eddfdb46796b..6a6e150c9a2b 100644 > --- a/rules/xorg-data-xbitmaps.make > +++ b/rules/xorg-data-xbitmaps.make > @@ -30,7 +30,8 @@ XORG_DATA_XBITMAPS_DIR := $(BUILDDIR)/$(XORG_DATA_XBITMAPS) > # > # autoconf > # > -XORG_DATA_XBITMAPS_AUTOCONF := $(CROSS_AUTOCONF_USR) > +XORG_DATA_XBITMAPS_CONF_TOOL := autoconf > +XORG_DATA_XBITMAPS_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/xorg-driver-input-tslib.make b/rules/xorg-driver-input-tslib.make > index f67eb87d37d9..468ba0fceca3 100644 > --- a/rules/xorg-driver-input-tslib.make > +++ b/rules/xorg-driver-input-tslib.make > @@ -29,7 +29,8 @@ XORG_DRIVER_INPUT_TSLIB_DIR := $(BUILDDIR)/$(XORG_DRIVER_INPUT_TSLIB) > # > # autoconf > # > -XORG_DRIVER_INPUT_TSLIB_AUTOCONF := $(CROSS_AUTOCONF_USR) > +XORG_DRIVER_INPUT_TSLIB_CONF_TOOL := autoconf > +XORG_DRIVER_INPUT_TSLIB_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/xorg-font-adobe-100dpi.make b/rules/xorg-font-adobe-100dpi.make > index 31de69db5386..3d366e4b03bd 100644 > --- a/rules/xorg-font-adobe-100dpi.make > +++ b/rules/xorg-font-adobe-100dpi.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_ADOBE_100DPI_AUTOCONF := \ > +XORG_FONT_ADOBE_100DPI_CONF_TOOL := autoconf > +XORG_FONT_ADOBE_100DPI_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/100dpi > > diff --git a/rules/xorg-font-adobe-75dpi.make b/rules/xorg-font-adobe-75dpi.make > index 957a3a9566a9..af786fa78c6a 100644 > --- a/rules/xorg-font-adobe-75dpi.make > +++ b/rules/xorg-font-adobe-75dpi.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_ADOBE_75DPI_AUTOCONF := \ > +XORG_FONT_ADOBE_75DPI_CONF_TOOL := autoconf > +XORG_FONT_ADOBE_75DPI_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/75dpi > > diff --git a/rules/xorg-font-adobe-utopia-100dpi.make b/rules/xorg-font-adobe-utopia-100dpi.make > index cf7d00b149e1..06325f9c1c75 100644 > --- a/rules/xorg-font-adobe-utopia-100dpi.make > +++ b/rules/xorg-font-adobe-utopia-100dpi.make > @@ -34,11 +34,11 @@ endif > # > # autoconf > # > -XORG_FONT_ADOBE_UTOPIA_100DPI_AUTOCONF := \ > +XORG_FONT_ADOBE_UTOPIA_100DPI_CONF_TOOL := autoconf > +XORG_FONT_ADOBE_UTOPIA_100DPI_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/100dpi > > - > # ---------------------------------------------------------------------------- > # Install > # ---------------------------------------------------------------------------- > diff --git a/rules/xorg-font-adobe-utopia-type1.make b/rules/xorg-font-adobe-utopia-type1.make > index 4ba669128f0c..e4d80b9392eb 100644 > --- a/rules/xorg-font-adobe-utopia-type1.make > +++ b/rules/xorg-font-adobe-utopia-type1.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_ADOBE_UTOPIA_TYPE1_AUTOCONF := \ > +XORG_FONT_ADOBE_UTOPIA_TYPE1_CONF_TOOL := autoconf > +XORG_FONT_ADOBE_UTOPIA_TYPE1_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/Type1 > > diff --git a/rules/xorg-font-alias.make b/rules/xorg-font-alias.make > index 13ee2919b938..59df1ff6a41e 100644 > --- a/rules/xorg-font-alias.make > +++ b/rules/xorg-font-alias.make > @@ -30,7 +30,8 @@ XORG_FONT_ALIAS_LICENSE := Vakulenko > # > # autoconf > # > -XORG_FONT_ALIAS_AUTOCONF := \ > +XORG_FONT_ALIAS_CONF_TOOL := autoconf > +XORG_FONT_ALIAS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontrootdir=$(XORG_FONTDIR) > > diff --git a/rules/xorg-font-arabic-misc.make b/rules/xorg-font-arabic-misc.make > index 14e5a65f4205..cafbaed16a44 100644 > --- a/rules/xorg-font-arabic-misc.make > +++ b/rules/xorg-font-arabic-misc.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_ARABIC_MISC_AUTOCONF := \ > +XORG_FONT_ARABIC_MISC_CONF_TOOL := autoconf > +XORG_FONT_ARABIC_MISC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/misc > > diff --git a/rules/xorg-font-bh-100dpi.make b/rules/xorg-font-bh-100dpi.make > index 3be6938f2cad..8a7a18138270 100644 > --- a/rules/xorg-font-bh-100dpi.make > +++ b/rules/xorg-font-bh-100dpi.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_BH_100DPI_AUTOCONF := \ > +XORG_FONT_BH_100DPI_CONF_TOOL := autoconf > +XORG_FONT_BH_100DPI_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/100dpi > > diff --git a/rules/xorg-font-bh-75dpi.make b/rules/xorg-font-bh-75dpi.make > index d5ae29681334..4442bd153208 100644 > --- a/rules/xorg-font-bh-75dpi.make > +++ b/rules/xorg-font-bh-75dpi.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_BH_75DPI_AUTOCONF := \ > +XORG_FONT_BH_75DPI_CONF_TOOL := autoconf > +XORG_FONT_BH_75DPI_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/75dpi > > diff --git a/rules/xorg-font-bitstream-100dpi.make b/rules/xorg-font-bitstream-100dpi.make > index 1c5b06867a41..bc6d22525992 100644 > --- a/rules/xorg-font-bitstream-100dpi.make > +++ b/rules/xorg-font-bitstream-100dpi.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_BITSTREAM_100DPI_AUTOCONF := \ > +XORG_FONT_BITSTREAM_100DPI_CONF_TOOL := autoconf > +XORG_FONT_BITSTREAM_100DPI_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/100dpi > > diff --git a/rules/xorg-font-bitstream-75dpi.make b/rules/xorg-font-bitstream-75dpi.make > index d1254b7981d2..ee04add4c7f1 100644 > --- a/rules/xorg-font-bitstream-75dpi.make > +++ b/rules/xorg-font-bitstream-75dpi.make > @@ -34,11 +34,11 @@ endif > # > # autoconf > # > -XORG_FONT_BITSTREAM_75DPI_AUTOCONF := \ > +XORG_FONT_BITSTREAM_75DPI_CONF_TOOL := autoconf > +XORG_FONT_BITSTREAM_75DPI_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/75dpi > > - > # ---------------------------------------------------------------------------- > # Install > # ---------------------------------------------------------------------------- > diff --git a/rules/xorg-font-bitstream-speedo.make b/rules/xorg-font-bitstream-speedo.make > index d6393b15f9ef..0867e3a2ddbe 100644 > --- a/rules/xorg-font-bitstream-speedo.make > +++ b/rules/xorg-font-bitstream-speedo.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_BITSTREAM_SPEEDO_AUTOCONF := \ > +XORG_FONT_BITSTREAM_SPEEDO_CONF_TOOL := autoconf > +XORG_FONT_BITSTREAM_SPEEDO_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/Speedo > > diff --git a/rules/xorg-font-bitstream-type1.make b/rules/xorg-font-bitstream-type1.make > index 3e2922ac5ef1..0cb896474572 100644 > --- a/rules/xorg-font-bitstream-type1.make > +++ b/rules/xorg-font-bitstream-type1.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_BITSTREAM_TYPE1_AUTOCONF := \ > +XORG_FONT_BITSTREAM_TYPE1_CONF_TOOL := autoconf > +XORG_FONT_BITSTREAM_TYPE1_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/Type1 > > diff --git a/rules/xorg-font-cronyx-cyrillic.make b/rules/xorg-font-cronyx-cyrillic.make > index fc7dacebf18a..02b48e6ce55a 100644 > --- a/rules/xorg-font-cronyx-cyrillic.make > +++ b/rules/xorg-font-cronyx-cyrillic.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_CRONYX_CYRILLIC_AUTOCONF := \ > +XORG_FONT_CRONYX_CYRILLIC_CONF_TOOL := autoconf > +XORG_FONT_CRONYX_CYRILLIC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/cyrillic > > diff --git a/rules/xorg-font-cursor-misc.make b/rules/xorg-font-cursor-misc.make > index 96da970be90b..52064f6e5bc6 100644 > --- a/rules/xorg-font-cursor-misc.make > +++ b/rules/xorg-font-cursor-misc.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_CURSOR_MISC_AUTOCONF := \ > +XORG_FONT_CURSOR_MISC_CONF_TOOL := autoconf > +XORG_FONT_CURSOR_MISC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/misc > > diff --git a/rules/xorg-font-daewoo-misc.make b/rules/xorg-font-daewoo-misc.make > index 7498c63a2bfc..71cd1263eed0 100644 > --- a/rules/xorg-font-daewoo-misc.make > +++ b/rules/xorg-font-daewoo-misc.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_DAEWOO_MISC_AUTOCONF := \ > +XORG_FONT_DAEWOO_MISC_CONF_TOOL := autoconf > +XORG_FONT_DAEWOO_MISC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/misc > > diff --git a/rules/xorg-font-dec-misc.make b/rules/xorg-font-dec-misc.make > index 68018e6fc83b..3151874f8a80 100644 > --- a/rules/xorg-font-dec-misc.make > +++ b/rules/xorg-font-dec-misc.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_DEC_MISC_AUTOCONF := \ > +XORG_FONT_DEC_MISC_CONF_TOOL := autoconf > +XORG_FONT_DEC_MISC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/misc > > diff --git a/rules/xorg-font-encodings.make b/rules/xorg-font-encodings.make > index a058884270be..b92ecd07492c 100644 > --- a/rules/xorg-font-encodings.make > +++ b/rules/xorg-font-encodings.make > @@ -33,7 +33,8 @@ endif > # > # autoconf > # > -XORG_FONT_ENCODINGS_AUTOCONF := \ > +XORG_FONT_ENCODINGS_CONF_TOOL := autoconf > +XORG_FONT_ENCODINGS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-encodingsdir=$(XORG_FONTDIR)/encodings > > diff --git a/rules/xorg-font-ibm-type1.make b/rules/xorg-font-ibm-type1.make > index 4497398366fb..2f3321592a0a 100644 > --- a/rules/xorg-font-ibm-type1.make > +++ b/rules/xorg-font-ibm-type1.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_IBM_TYPE1_AUTOCONF := \ > +XORG_FONT_IBM_TYPE1_CONF_TOOL := autoconf > +XORG_FONT_IBM_TYPE1_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/Type1 > > diff --git a/rules/xorg-font-isas-misc.make b/rules/xorg-font-isas-misc.make > index cdda221f5e7b..e076e708b9da 100644 > --- a/rules/xorg-font-isas-misc.make > +++ b/rules/xorg-font-isas-misc.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_ISAS_MISC_AUTOCONF := \ > +XORG_FONT_ISAS_MISC_CONF_TOOL := autoconf > +XORG_FONT_ISAS_MISC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/misc > > diff --git a/rules/xorg-font-jis-misc.make b/rules/xorg-font-jis-misc.make > index 7c56b765b733..7ff38e2938e4 100644 > --- a/rules/xorg-font-jis-misc.make > +++ b/rules/xorg-font-jis-misc.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_JIS_MISC_AUTOCONF := \ > +XORG_FONT_JIS_MISC_CONF_TOOL := autoconf > +XORG_FONT_JIS_MISC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/misc > > diff --git a/rules/xorg-font-micro-misc.make b/rules/xorg-font-micro-misc.make > index cc95416005d3..2535125597f3 100644 > --- a/rules/xorg-font-micro-misc.make > +++ b/rules/xorg-font-micro-misc.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_MICRO_MISC_AUTOCONF := \ > +XORG_FONT_MICRO_MISC_CONF_TOOL := autoconf > +XORG_FONT_MICRO_MISC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/misc > > diff --git a/rules/xorg-font-misc-cyrillic.make b/rules/xorg-font-misc-cyrillic.make > index 254d47eaa6b3..a934bd8cd6fb 100644 > --- a/rules/xorg-font-misc-cyrillic.make > +++ b/rules/xorg-font-misc-cyrillic.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_MISC_CYRILLIC_AUTOCONF := \ > +XORG_FONT_MISC_CYRILLIC_CONF_TOOL := autoconf > +XORG_FONT_MISC_CYRILLIC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/cyrillic > > diff --git a/rules/xorg-font-misc-ethiopic.make b/rules/xorg-font-misc-ethiopic.make > index 25c5bbe75a5c..76b2950991e6 100644 > --- a/rules/xorg-font-misc-ethiopic.make > +++ b/rules/xorg-font-misc-ethiopic.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_MISC_ETHIOPIC_AUTOCONF := \ > +XORG_FONT_MISC_ETHIOPIC_CONF_TOOL := autoconf > +XORG_FONT_MISC_ETHIOPIC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-ttf-fontdir=$(XORG_FONTDIR)/truetype \ > --with-otf-fontdir=$(XORG_FONTDIR)/opentype > diff --git a/rules/xorg-font-misc-meltho.make b/rules/xorg-font-misc-meltho.make > index 21dc90ceb440..94d0f2673ceb 100644 > --- a/rules/xorg-font-misc-meltho.make > +++ b/rules/xorg-font-misc-meltho.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_MISC_MELTHO_AUTOCONF := \ > +XORG_FONT_MISC_MELTHO_CONF_TOOL := autoconf > +XORG_FONT_MISC_MELTHO_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/opentype > > diff --git a/rules/xorg-font-misc-misc.make b/rules/xorg-font-misc-misc.make > index 25377d0160ec..de34231a8a2f 100644 > --- a/rules/xorg-font-misc-misc.make > +++ b/rules/xorg-font-misc-misc.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_MISC_MISC_AUTOCONF := \ > +XORG_FONT_MISC_MISC_CONF_TOOL := autoconf > +XORG_FONT_MISC_MISC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/misc > > diff --git a/rules/xorg-font-mutt-misc.make b/rules/xorg-font-mutt-misc.make > index 6ff14a82f092..ea138c29764d 100644 > --- a/rules/xorg-font-mutt-misc.make > +++ b/rules/xorg-font-mutt-misc.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_MUTT_MISC_AUTOCONF := \ > +XORG_FONT_MUTT_MISC_CONF_TOOL := autoconf > +XORG_FONT_MUTT_MISC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/misc > > diff --git a/rules/xorg-font-schumacher-misc.make b/rules/xorg-font-schumacher-misc.make > index 3d281e6fb325..809051bce096 100644 > --- a/rules/xorg-font-schumacher-misc.make > +++ b/rules/xorg-font-schumacher-misc.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_SCHUMACHER_MISC_AUTOCONF := $(CROSS_AUTOCONF_USR) > +XORG_FONT_SCHUMACHER_MISC_CONF_TOOL := autoconf > +XORG_FONT_SCHUMACHER_MISC_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Install > diff --git a/rules/xorg-font-screen-cyrillic.make b/rules/xorg-font-screen-cyrillic.make > index 43d96d2ba7f4..06b80669fc0f 100644 > --- a/rules/xorg-font-screen-cyrillic.make > +++ b/rules/xorg-font-screen-cyrillic.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_SCREEN_CYRILLIC_AUTOCONF := \ > +XORG_FONT_SCREEN_CYRILLIC_CONF_TOOL := autoconf > +XORG_FONT_SCREEN_CYRILLIC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/cyrillic > > diff --git a/rules/xorg-font-sony-misc.make b/rules/xorg-font-sony-misc.make > index 0841fd0db346..374f3d5191ab 100644 > --- a/rules/xorg-font-sony-misc.make > +++ b/rules/xorg-font-sony-misc.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_SONY_MISC_AUTOCONF := \ > +XORG_FONT_SONY_MISC_CONF_TOOL := autoconf > +XORG_FONT_SONY_MISC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/misc > > diff --git a/rules/xorg-font-sun-misc.make b/rules/xorg-font-sun-misc.make > index 5d055511fabc..bda2c4e6fa5a 100644 > --- a/rules/xorg-font-sun-misc.make > +++ b/rules/xorg-font-sun-misc.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_SUN_MISC_AUTOCONF := \ > +XORG_FONT_SUN_MISC_CONF_TOOL := autoconf > +XORG_FONT_SUN_MISC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/misc > > diff --git a/rules/xorg-font-winitzki-cyrillic.make b/rules/xorg-font-winitzki-cyrillic.make > index 8e827859bce5..7882ac4fac6b 100644 > --- a/rules/xorg-font-winitzki-cyrillic.make > +++ b/rules/xorg-font-winitzki-cyrillic.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_WINITZKI_CYRILLIC_AUTOCONF := \ > +XORG_FONT_WINITZKI_CYRILLIC_CONF_TOOL := autoconf > +XORG_FONT_WINITZKI_CYRILLIC_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/cyrillic > > diff --git a/rules/xorg-font-xfree86-type1.make b/rules/xorg-font-xfree86-type1.make > index 4ff6f9b58b88..1121a0159504 100644 > --- a/rules/xorg-font-xfree86-type1.make > +++ b/rules/xorg-font-xfree86-type1.make > @@ -34,7 +34,8 @@ endif > # > # autoconf > # > -XORG_FONT_XFREE86_TYPE1_AUTOCONF := \ > +XORG_FONT_XFREE86_TYPE1_CONF_TOOL := autoconf > +XORG_FONT_XFREE86_TYPE1_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-fontdir=$(XORG_FONTDIR)/Type1 > > diff --git a/rules/xorg-lib-WindowsWM.make b/rules/xorg-lib-WindowsWM.make > index faf03d129dda..af18897816b8 100644 > --- a/rules/xorg-lib-WindowsWM.make > +++ b/rules/xorg-lib-WindowsWM.make > @@ -30,7 +30,9 @@ XORG_LIB_WINDOWSWM_DIR := $(BUILDDIR)/$(XORG_LIB_WINDOWSWM) > # > # autoconf > # > -XORG_LIB_WINDOWSWM_AUTOCONF := $(CROSS_AUTOCONF_USR) \ > +XORG_LIB_WINDOWSWM_CONF_TOOL := autoconf > +XORG_LIB_WINDOWSWM_CONF_OPT := \ > + $(CROSS_AUTOCONF_USR) \ > --disable-malloc0returnsnull > > # ---------------------------------------------------------------------------- > diff --git a/rules/xorg-lib-Xxf86misc.make b/rules/xorg-lib-Xxf86misc.make > index 1c1fe06bf032..8480beca2a6c 100644 > --- a/rules/xorg-lib-Xxf86misc.make > +++ b/rules/xorg-lib-Xxf86misc.make > @@ -30,9 +30,10 @@ XORG_LIB_XXF86MISC_DIR := $(BUILDDIR)/$(XORG_LIB_XXF86MISC) > # > # autoconf > # > -XORG_LIB_XXF86MISC_AUTOCONF := $(CROSS_AUTOCONF_USR) > - > -XORG_LIB_XXF86MISC_AUTOCONF += --disable-malloc0returnsnull > +XORG_LIB_XXF86MISC_CONF_TOOL := autoconf > +XORG_LIB_XXF86MISC_CONF_OPT := \ > + $(CROSS_AUTOCONF_USR) \ > + --disable-malloc0returnsnull > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/xorg-lib-oldX.make b/rules/xorg-lib-oldX.make > index 0b87e68a1b1a..f09543232534 100644 > --- a/rules/xorg-lib-oldX.make > +++ b/rules/xorg-lib-oldX.make > @@ -30,7 +30,9 @@ XORG_LIB_OLDX_DIR := $(BUILDDIR)/$(XORG_LIB_OLDX) > # > # autoconf > # > -XORG_LIB_OLDX_AUTOCONF := $(CROSS_AUTOCONF_USR) \ > +XORG_LIB_OLDX_CONF_TOOL := autoconf > +XORG_LIB_OLDX_CONF_OPT := \ > + $(CROSS_AUTOCONF_USR) \ > --disable-malloc0returnsnull > > # ---------------------------------------------------------------------------- > diff --git a/rules/xorg-lib-xkbui.make b/rules/xorg-lib-xkbui.make > index 0d79993ec075..4fb050b3923b 100644 > --- a/rules/xorg-lib-xkbui.make > +++ b/rules/xorg-lib-xkbui.make > @@ -30,7 +30,8 @@ XORG_LIB_XKBUI_DIR := $(BUILDDIR)/$(XORG_LIB_XKBUI) > # > # autoconf > # > -XORG_LIB_XKBUI_AUTOCONF := $(CROSS_AUTOCONF_USR) > +XORG_LIB_XKBUI_CONF_TOOL := autoconf > +XORG_LIB_XKBUI_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/xterm.make b/rules/xterm.make > index 2f85f4433e45..832391070312 100644 > --- a/rules/xterm.make > +++ b/rules/xterm.make > @@ -32,7 +32,8 @@ XTERM_LICENSE_FILES := \ > # > # autoconf > # > -XTERM_AUTOCONF := \ > +XTERM_CONF_TOOL := autoconf > +XTERM_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-freetype \ > --disable-rpath-hack \