various configure related cleanups

SVN-Revision: 6372

8 files changed, 49 insertions, 134 deletions

diff --git a/package/bridge/Makefile b/package/bridge/Makefile
index 0091af5a23..eb33bc3e6e 100644
--- a/package/bridge/Makefile
+++ b/package/bridge/Makefile
@@ -31,11 +31,7 @@ define Package/bridge
   URL:=http://bridge.sourceforge.net/
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--with-linux-headers="$(LINUX_DIR)" \
-	)
-endef
+CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)"
 
 define Package/bridge/install
 	$(INSTALL_DIR) $(1)/usr/sbin
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 9dba9f4a7c..23e125e7cf 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -41,47 +41,26 @@ define Package/dropbearconvert
   TITLE:=Utility for converting SSH keys
 endef
 
+CONFIGURE_ARGS += \
+	--with-shared \
+	--disable-pam \
+	--enable-openpty \
+	--enable-syslog \
+	--disable-shadow \
+	--disable-lastlog \
+	--disable-utmp \
+	--disable-utmpx \
+	--disable-wtmp \
+	--disable-wtmpx \
+	--disable-loginfunc \
+	--disable-pututline \
+	--disable-pututxline \
+	--disable-zlib
+
 define Build/Configure
 	$(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h
 	$(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(PKG_BUILD_DIR)/options.h
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--with-shared \
-			--disable-pam \
-			--enable-openpty \
-			--enable-syslog \
-			--disable-shadow \
-			--disable-lastlog \
-			--disable-utmp \
-			--disable-utmpx \
-			--disable-wtmp \
-			--disable-wtmpx \
-			--disable-loginfunc \
-			--disable-pututline \
-			--disable-pututxline \
-			--disable-zlib \
-	);
+	$(call Build/Configure/Default)
 endef
 
 define Build/Compile
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 1cbca85fad..1543a7bc00 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -47,15 +47,12 @@ define Package/resize2fs
   DEPENDS:=e2fsprogs
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--disable-rpath \
-		--enable-elf-shlibs \
-		--enable-dynamic-e2fsck \
-	)
-endef
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-rpath \
+	--enable-elf-shlibs \
+	--enable-dynamic-e2fsck
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/util \
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index 5a58f8f8da..fa916f0b1d 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -29,13 +29,10 @@ define Package/libgmp
   URL:=http://www.swox.com/gmp/
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static, \
-		CC="$(TARGET_CROSS)gcc" \
-	)
-endef
+CONFIGURE_VARS += CC="$(TARGET_CROSS)gcc"
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
 
 define Build/Compile
 	$(call Build/Compile/Default, \
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 5951649ade..67772f126c 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -31,15 +31,7 @@ define Package/ipsec-tools
   URL:=http://ipsec-tools.sourceforge.net/
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); touch \
-		configure.ac \
-		aclocal.m4 \
-		Makefile.in \
-		config.h.in \
-		configure \
-	);
-	$(call Build/Configure/Default, \
+CONFIGURE_ARGS += \
 		--enable-shared \
 		--enable-static \
 		--with-kernel-headers="$(LINUX_DIR)/include" \
@@ -48,8 +40,17 @@ define Build/Configure
 		--without-libradius \
 		--without-libpam \
 		--enable-dpd \
-		--enable-natt \
+		--enable-natt
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); touch \
+		configure.ac \
+		aclocal.m4 \
+		Makefile.in \
+		config.h.in \
+		configure \
 	);
+	$(call Build/Configure/Default)
 endef
 
 # override CFLAGS holding "-Werror" that break builds on compile warnings
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index baad4fdc06..a537cdf42c 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -33,31 +33,6 @@ define Package/kexec-tools
   URL:=http://www.xmission.com/~ebiederm/files/kexec/README
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		./configure \
-		  --target=$(GNU_TARGET_NAME) \
-		  --host=$(GNU_TARGET_NAME) \
-		  --build=$(GNU_HOST_NAME) \
-		  --program-prefix="" \
-		  --program-suffix="" \
-		  --prefix=/usr \
-		  --exec-prefix=/usr \
-		  --bindir=/usr/bin \
-		  --sbindir=/usr/sbin \
-		  --libexecdir=/usr/lib \
-		  --sysconfdir=/etc \
-		  --datadir=/usr/share \
-		  --localstatedir=/var \
-		  --mandir=/usr/man \
-		  --infodir=/usr/info \
-		  $(DISABLE_NLS) \
-		  $(DISABLE_LARGEFILE) \
-	);
-endef
-
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
diff --git a/package/keynote/Makefile b/package/keynote/Makefile
index 264f163219..9d97a96ca1 100644
--- a/package/keynote/Makefile
+++ b/package/keynote/Makefile
@@ -35,12 +35,9 @@ define Package/keynote
   URL:=http://www1.cs.columbia.edu/~angelos/keynote.html
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-static \
-		--enable-shared \
-	)
-endef
+CONFIGURE_ARGS += \
+	--enable-static \
+	--enable-shared
 
 define Build/Compile
 	$(call Build/Compile/Default, \
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index c33c034e8f..20eb17e70a 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -32,40 +32,13 @@ define Package/libpcap
   URL:=http://www.tcpdump.org/
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--disable-yydebug \
-			--enable-ipv6 \
-			--with-build-cc="$(HOSTCC)" \
-			--with-pcap=linux \
-	);
-endef
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-yydebug \
+	--enable-ipv6 \
+	--with-build-cc="$(HOSTCC)" \
+	--with-pcap=linux
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \