diff mbox series

Update for numerous lfs-files: removed deprecated configure options

Message ID 20171204173751.1776-1-matthias.fischer@ipfire.org
State Dropped
Commit 8f6e4eaff74ea1c90815ede2663ed2561508a56f
Headers
Series Update for numerous lfs-files: removed deprecated configure options |

Commit Message

Matthias Fischer Dec. 5, 2017, 4:37 a.m. UTC 
  Hello,

During one of the last building sessions I noticed about 70 warnings
considering "configure: WARNING: unrecognized options: ..." in '_build.ipfire.log'
and (e.g.). Not really important, but ugly. Looks unprofessional.

So I tried to clean things up and did some cosmetics.

Please pull from

git://git.ipfire.org/people/mfischer/ipfire-2.x.git next

to get these changes.

The only remaining warnings are "--with-tclinclude, --enable-shared, --enable-threads",
dealing with 'tcl8.6.6'. Didn't find the right spot to get rid of these yet.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 lfs/autoconf       |  4 +++-
 lfs/automake       |  6 ++++--
 lfs/cyrus-imapd    | 17 ++++++++++++-----
 lfs/dhcp           |  1 -
 lfs/e2fsprogs      |  2 +-
 lfs/expat          |  4 +++-
 lfs/faad2          |  5 ++++-
 lfs/fcron          | 32 ++++++++++++++++----------------
 lfs/ffmpeg         |  1 +
 lfs/fuse           |  6 ++++--
 lfs/ghostscript    |  4 ++--
 lfs/gmp            |  4 +---
 lfs/groff          |  4 +++-
 lfs/gzip           |  4 ++--
 lfs/kmod           |  1 -
 lfs/less           |  5 ++++-
 lfs/libjpeg-compat |  6 +++++-
 lfs/libmpeg2       |  5 ++++-
 lfs/libtool        |  4 +++-
 lfs/libupnp        |  4 +++-
 lfs/libusb         |  4 +++-
 lfs/m4             |  6 +++---
 lfs/mpfr           |  3 ++-
 lfs/nasm           |  4 +++-
 lfs/openssh        | 46 +++++++++++++++++++++++++---------------------
 lfs/openvmtools    | 22 +++++++++++++++-------
 lfs/patch          |  6 +++---
 lfs/python         |  5 ++++-
 lfs/python3        |  5 ++++-
 lfs/rpcbind        |  7 ++++++-
 lfs/shadow         | 14 ++++++++------
 lfs/taglib         |  4 ++--
 lfs/tcl            |  4 ++--
 33 files changed, 155 insertions(+), 94 deletions(-)
diff mbox series

Patch

diff --git a/lfs/autoconf b/lfs/autoconf
index 9c58e20cc..7e622da86 100644
--- a/lfs/autoconf
+++ b/lfs/autoconf
@@ -69,7 +69,9 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/automake b/lfs/automake
index 15bdad1e5..0b3d9cce8 100644
--- a/lfs/automake
+++ b/lfs/automake
@@ -81,8 +81,10 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch
-	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls \
-			--docdir=/usr/share/doc/automake-1.15
+	cd $(DIR_APP) && ./configure \
+		--prefix=$(PREFIX) \
+		--docdir=/usr/share/doc/automake-1.15
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index 73f73e18c..7dea649a3 100644
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -77,11 +77,18 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --with-service-path=/usr/lib/cyrus \
-				--with-cyrus-prefix=/usr/lib/cyrus --sysconfdir=/var/ipfire/cyrusimap \
-				--with-auth=unix --with-perl --with-sasl --with-idle=idled \
-				--with-syslogfacility=MAIL --enable-listext --without-snmp \
-				--enable-autocreate --enable-idled
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--with-service-path=/usr/lib/cyrus \
+		--with-cyrus-prefix=/usr/lib/cyrus \
+		--sysconfdir=/var/ipfire/cyrusimap \
+		--with-perl \
+		--with-sasl \
+		--with-syslogfacility=MAIL \
+		--without-snmp \
+		--enable-autocreate \
+		--enable-idled
+
 	cd $(DIR_APP) && make $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
 	-mkdir /var/imap
diff --git a/lfs/dhcp b/lfs/dhcp
index 4c613a7d8..262a25129 100644
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -107,7 +107,6 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--prefix=/usr \
 			--sysconfdir=/etc/dhcp \
 			--with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-			--disable-static \
 			--enable-paranoia \
 			--enable-early-chroot \
 			--disable-dhcpv6
diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 90e28ac07..8e265c1e2 100644
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -76,8 +76,8 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--prefix=/usr \
 			--with-root-prefix="" \
 			--enable-elf-shlibs \
-			--disable-evms \
 			--disable-nls
+
 	cd $(DIR_APP)/build && make $(MAKETUNING)
 	cd $(DIR_APP)/build && make install
 	cd $(DIR_APP)/build && make install-libs
diff --git a/lfs/expat b/lfs/expat
index aa9759094..5bb22ec27 100644
--- a/lfs/expat
+++ b/lfs/expat
@@ -70,7 +70,9 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/$(THISAPP)
diff --git a/lfs/faad2 b/lfs/faad2
index bd258f79a..7cadb9aef 100644
--- a/lfs/faad2
+++ b/lfs/faad2
@@ -77,7 +77,10 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared 
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--enable-shared
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/fcron b/lfs/fcron
index 5cc2cd62a..b548c1310 100644
--- a/lfs/fcron
+++ b/lfs/fcron
@@ -70,22 +70,22 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure	\
-	    --prefix=/usr			\
-	    --disable-nls			\
-	    --without-sendmail		\
-	    --with-spooldir=/var/spool/cron 	\
-	    --with-fifodir=/var/run	 	\
-	    --with-piddir=/var/run	 	\
-	    --sysconfdir=/etc		 	\
-	    --with-username=cron		\
-	    --with-groupname=cron		\
-	    --with-run-non-privileged=no	\
-	    --with-fcrondyn=no		\
-	    --with-sysfcrontab=no		\
-	    --with-boot-install=no		\
-	    --with-pam=no			\
-	    --with-selinux=no
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--without-sendmail \
+		--with-spooldir=/var/spool/cron \
+		--with-fifodir=/var/run \
+		--with-piddir=/var/run \
+		--sysconfdir=/etc \
+		--with-username=cron \
+		--with-groupname=cron \
+		--with-run-non-privileged=no \
+		--with-fcrondyn=no \
+		--with-sysfcrontab=no \
+		--with-boot-install=no \
+		--with-pam=no \
+		--with-selinux=no
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	echo "root" > /etc/fcron.allow
diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 77258a0ed..258e29b7b 100644
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -84,6 +84,7 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-version3 \
 		--enable-avfilter \
 		--enable-avresample
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/fuse b/lfs/fuse
index 2639156b2..275647252 100644
--- a/lfs/fuse
+++ b/lfs/fuse
@@ -50,7 +50,7 @@  download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
 	@$(PAK)
 
 ###############################################################################
@@ -74,7 +74,9 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fuse-2.9.2-namespace-conflict-fix.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-kernel-module
+	cd $(DIR_APP) && ./configure \
+	--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/ghostscript b/lfs/ghostscript
index 7ee1ce4e4..6d297dabc 100644
--- a/lfs/ghostscript
+++ b/lfs/ghostscript
@@ -88,8 +88,8 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
-			--with-system-libtiff \
-			--with-install-cups
+			--with-system-libtiff
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
diff --git a/lfs/gmp b/lfs/gmp
index 8dc9b7350..4d55e4f76 100644
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -39,9 +39,7 @@  endif
 
 CONFIGURE_OPTIONS = \
 	--prefix=/usr \
-	--enable-cxx \
-	--enable-mpbsd \
-	--disable-nls
+	--enable-cxx
 
 ###############################################################################
 # Top-level Rules
diff --git a/lfs/groff b/lfs/groff
index a0bb0bd3f..e4c293bb7 100644
--- a/lfs/groff
+++ b/lfs/groff
@@ -70,7 +70,9 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && PAGE=A4 ./configure --prefix=/usr --enable-multibyte --disable-nls
+	cd $(DIR_APP) && PAGE=A4 ./configure \
+		--prefix=/usr
+
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 	ln -svf eqn /usr/bin/geqn
diff --git a/lfs/gzip b/lfs/gzip
index 12fae78e9..233c6ce40 100644
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -35,10 +35,10 @@  DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls --bindir=/bin
+  EXTRA_CONFIG = --prefix=/usr --bindir=/bin
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
 endif
 
 ###############################################################################
diff --git a/lfs/kmod b/lfs/kmod
index dc2dc10b8..8e0bb0d53 100644
--- a/lfs/kmod
+++ b/lfs/kmod
@@ -74,7 +74,6 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--prefix=/usr \
 		--bindir=/bin \
 		--sysconfdir=/etc \
-		--enable-zlib \
 		--disable-manpages
 
 #		--libdir=/lib \
diff --git a/lfs/less b/lfs/less
index 3a3548338..10528d866 100644
--- a/lfs/less
+++ b/lfs/less
@@ -70,7 +70,10 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat
index 4166d52c7..0e712d0c2 100644
--- a/lfs/libjpeg-compat
+++ b/lfs/libjpeg-compat
@@ -72,7 +72,11 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--enable-static \
+		--enable-shared
+
 	cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && mv -vf .libs/{libjpeg.so.62.1.0,libjpeg.so.62,libturbojpeg.so.0.0.0} /usr/lib/
diff --git a/lfs/libmpeg2 b/lfs/libmpeg2
index 6d664c9f0..488a59737 100644
--- a/lfs/libmpeg2
+++ b/lfs/libmpeg2
@@ -77,8 +77,11 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared \
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--enable-shared \
 		--disable-accel-detect
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/libtool b/lfs/libtool
index 017214505..d7e9a1555 100644
--- a/lfs/libtool
+++ b/lfs/libtool
@@ -75,7 +75,9 @@  dist:
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/libupnp b/lfs/libupnp
index 3f8d2b549..18f5e6d8a 100644
--- a/lfs/libupnp
+++ b/lfs/libupnp
@@ -70,7 +70,9 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/libusb b/lfs/libusb
index f557bd8be..f7fc12420 100644
--- a/lfs/libusb
+++ b/lfs/libusb
@@ -70,7 +70,9 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-build-docs --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	echo "# Set group ownership for raw USB devices" > /etc/udev/rules.d/23-usb.rules
diff --git a/lfs/m4 b/lfs/m4
index 3864d4215..5bb860444 100644
--- a/lfs/m4
+++ b/lfs/m4
@@ -35,12 +35,12 @@  DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
+  EXTRA_CONFIG = --prefix=/usr
   EXTRA_MAKE =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
-  EXTRA_MAKE = 
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
+  EXTRA_MAKE =
 endif
 
 ###############################################################################
diff --git a/lfs/mpfr b/lfs/mpfr
index f729b8fe2..cb5a29b10 100644
--- a/lfs/mpfr
+++ b/lfs/mpfr
@@ -71,7 +71,8 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
-			--enable-thread-safe --disable-nls
+		--enable-thread-safe
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/nasm b/lfs/nasm
index 6eb34f101..5968dce72 100644
--- a/lfs/nasm
+++ b/lfs/nasm
@@ -70,7 +70,9 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+	--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/openssh b/lfs/openssh
index 56ac55a96..20a5dc115 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -71,29 +71,33 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \
-		    --libexecdir=/usr/lib/openssh --with-md5-passwords \
-		    --with-privsep-path=/var/empty --disable-nls \
-		    --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc/ssh \
+		--libexecdir=/usr/lib/openssh \
+		--with-md5-passwords \
+		--with-privsep-path=/var/empty \
+		--with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	sed -i -e 's/^#\?Port .*$$/Port 222/' \
-	    -e 's/^#\?Protocol .*$$/Protocol 2/' \
-	    -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
-	    -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \
-	    -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \
-	    -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \
-	    -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \
-	    -e 's/^#\?UsePAM .*$$//' \
-	    -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \
-	    -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \
-	    -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
-	    -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
-	    -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
-	    -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
-	    -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
-	    -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
-	    -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
-	    /etc/ssh/sshd_config
+		-e 's/^#\?Protocol .*$$/Protocol 2/' \
+		-e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
+		-e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \
+		-e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \
+		-e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \
+		-e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \
+		-e 's/^#\?UsePAM .*$$//' \
+		-e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \
+		-e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \
+		-e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
+		-e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
+		-e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
+		-e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
+		-e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
+		-e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
+		-e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
+		/etc/ssh/sshd_config
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/openvmtools b/lfs/openvmtools
index 1cf9427fe..b5b1fefa2 100644
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -81,13 +81,21 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -e "s/-Werror//g" -i configure.ac
 	cd $(DIR_APP) && autoreconf -vfi
-	cd $(DIR_APP) && ./configure --prefix=/usr \
-	   --with-kernel-release=$(KVER)-ipfire --without-pam \
-	   --disable-unity --without-gtk2 --without-gtkmm \
-	   --without-procps --without-icu \
-	   --without-x --with-linuxdir=/usr/src/linux \
-	   --without-kernel-modules --disable-deploypkg \
-	   --without-xerces-c --without-xerces
+
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--with-kernel-release=$(KVER)-ipfire \
+		--without-pam \
+		--without-gtk2 \
+		--without-gtkmm \
+		--without-procps \
+		--without-icu \
+		--without-x \
+		--with-linuxdir=/usr/src/linux \
+		--without-kernel-modules \
+		--disable-deploypkg \
+		--without-xerces
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	#install initscripts
diff --git a/lfs/patch b/lfs/patch
index c938ac8fa..065314d51 100644
--- a/lfs/patch
+++ b/lfs/patch
@@ -35,14 +35,14 @@  DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
+  EXTRA_CONFIG = --prefix=/usr
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
   EXTRA_MAKE =
-  EXTRA_INSTALL = 
+  EXTRA_INSTALL =
 endif
 
 ###############################################################################
diff --git a/lfs/python b/lfs/python
index 14ccb690c..70299852c 100644
--- a/lfs/python
+++ b/lfs/python
@@ -73,7 +73,10 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-2.7.13-getentropy.patch
 	cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
-		--prefix=/usr --enable-shared --with-system-ffi
+		--prefix=/usr \
+		--enable-shared \
+		--with-system-ffi
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/python3 b/lfs/python3
index 0fe493ba9..e753d96ab 100644
--- a/lfs/python3
+++ b/lfs/python3
@@ -79,7 +79,10 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
 	rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
 	cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
-		--prefix=/usr --enable-shared --with-system-ffi
+		--prefix=/usr \
+		--enable-shared \
+		--with-system-ffi
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/rpcbind b/lfs/rpcbind
index 046121f36..c1b696de7 100644
--- a/lfs/rpcbind
+++ b/lfs/rpcbind
@@ -79,7 +79,12 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/sbin --with-rpcuser=root --without-systemdsystemunitdir --disable-ipv6
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--bindir=/sbin \
+		--with-rpcuser=root \
+		--without-systemdsystemunitdir
+
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
 	#install initscripts
diff --git a/lfs/shadow b/lfs/shadow
index c445dd362..30000bfa1 100644
--- a/lfs/shadow
+++ b/lfs/shadow
@@ -71,12 +71,14 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
-	cd $(DIR_APP) && ./configure --libdir=/lib	\
-				--sysconfdir=/etc	\
-				--enable-shared		\
-				--without-selinux	\
-				--disable-nls		\
-				--with-group-name-max-length=32
+	cd $(DIR_APP) && ./configure \
+		--libdir=/lib \
+		--sysconfdir=/etc \
+		--enable-shared \
+		--without-selinux \
+		--disable-nls \
+		--with-group-name-max-length=32
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
diff --git a/lfs/taglib b/lfs/taglib
index eec6e97e9..058a15542 100644
--- a/lfs/taglib
+++ b/lfs/taglib
@@ -53,7 +53,7 @@  download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
 	@$(PAK)
 
 ###############################################################################
@@ -76,7 +76,7 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared 
+	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/tcl b/lfs/tcl
index 7762a1dc8..fb464dca3 100644
--- a/lfs/tcl
+++ b/lfs/tcl
@@ -76,9 +76,9 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifneq "$(ROOT)" ""
-	cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR) --disable-nls
+	cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR)
 else
-	cd $(DIR_APP)/unix && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP)/unix && ./configure --prefix=/usr
 endif
 	cd $(DIR_APP)/unix && make $(MAKETUNING)
 	cd $(DIR_APP)/unix && make install