cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/packages@5233 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile
index 917134a..81a1807 100644 (file)
--- a/admin/osiris/Makefile
+++ b/admin/osiris/Makefile
@@ -33,14 +33,12 @@ define Package/osirisd
 endef
 
 define Build/Configure
-  $(call Build/Configure/Default, \
-       --with-osiris-user=root \
-       --with-root-dir=/var/lib/osiris \
-       --with-readline=no, \
-       ac_cv_openssldir="$(STAGING_DIR)/usr" \
-       ac_cv_have_accrights_in_msghdr=no \
-       ac_cv_have_control_in_msghdr=yes \
-  )
+       $(call Build/Configure/Default, \
+               --with-osiris-user=root \
+               --with-root-dir=/var/lib/osiris \
+               --with-readline=no, \
+               ac_cv_openssldir="$(STAGING_DIR)/usr" \
+       )
 endef
 
 define Build/Compile   

diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile
index d6ebefd..78be0e9 100644 (file)
--- a/libs/avahi/Makefile
+++ b/libs/avahi/Makefile
@@ -89,9 +89,6 @@ define Build/Configure
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
                PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
-               ac_cv_func_malloc_0_nonnull=yes \
-               ac_cv_func_realloc_0_nonnull=yes \
-               ac_cv_func_memcmp_working=yes \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \

diff --git a/libs/glib/Makefile b/libs/glib/Makefile
index b60f5f0..d96f290 100644 (file)
--- a/libs/glib/Makefile
+++ b/libs/glib/Makefile
@@ -39,12 +39,6 @@ endef
 define Build/Configure
        (cd $(PKG_BUILD_DIR); rm -f config.cache; \
                glib_cv_sizeof_gmutex=24 \
-               ac_cv_sizeof_char=1 \
-               ac_cv_sizeof_short=2 \
-               ac_cv_sizeof_int=4 \
-               ac_cv_sizeof_long=4 \
-               ac_cv_sizeof_long_long=8 \
-               ac_cv_sizeof_void_p=4 \
                glib_cv_prog_cc_ansi_proto="no" \
                glib_cv_has__inline="yes" \
                glib_cv_has__inline__="yes" \
@@ -55,7 +49,6 @@ define Build/Configure
                glib_cv_va_val_copy="yes" \
                glib_cv_rtldglobal_broken="no" \
                glib_cv_uscore="no" \
-               ac_cv_func_getpwuid_r="yes" \
                glib_cv_func_pthread_mutex_trylock_posix="yes" \
                glib_cv_func_pthread_cond_timedwait_posix="yes" \
                glib_cv_sizeof_gmutex="24" \

diff --git a/libs/libelf/Makefile b/libs/libelf/Makefile
index d861b95..faa9331 100644 (file)
--- a/libs/libelf/Makefile
+++ b/libs/libelf/Makefile
@@ -41,7 +41,6 @@ define Build/Configure
                libelf_cv_struct_elf64_ehdr=yes \
                libelf_cv_type_elf64_addr=no \
                libelf_cv_struct_elf64_rel=yes \
-               ac_cv_sizeof_long_long=8 \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \

diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile
index f0afc43..d7738d7 100644 (file)
--- a/libs/libgphoto2/Makefile
+++ b/libs/libgphoto2/Makefile
@@ -42,11 +42,6 @@ define Package/libgphoto2-drivers
   TITLE:=Gphoto2 drivers for various cameras
 endef
 
-BIG_ENDIAN:=no
-ifeq ($(CONFIG_BIG_ENDIAN),y)
-  BIG_ENDIAN:=yes
-endif
-
 define Build/Configure
        $(call Build/Configure/Default, \
                --enable-shared \
@@ -63,8 +58,6 @@ define Build/Configure
                LIBUSB_CFLAGS="$$$$CPPFLAGS" \
                LIBUSB_LIBS="$$$$LDFLAGS -lusb" \
                LIBS="-lltdl" \
-               ac_cv_c_gettext_without_libintl=yes \
-               ac_cv_c_bigendian=$(BIG_ENDIAN) \
        )
 endef
 

diff --git a/libs/libnet-1.0.x/Makefile b/libs/libnet-1.0.x/Makefile
index 9a12520..66814b1 100644 (file)
--- a/libs/libnet-1.0.x/Makefile
+++ b/libs/libnet-1.0.x/Makefile
@@ -46,11 +46,9 @@ define Build/Configure
        $(call Build/Configure/Default, \
                --enable-shared \
                --enable-static \
-               --with-pf_packet=yes \
-               , \
-               ac_libnet_have_pf_packet=yes \
-               ac_cv_lbl_unaligned_fail=no \
+               --with-pf_packet=yes, \
                ac_cv_libnet_endianess=$(ENDIANESS) \
+               ac_libnet_have_pf_packet=yes \
        )
 endef
 

diff --git a/libs/libnet-1.1.x/Makefile b/libs/libnet-1.1.x/Makefile
index 5eb9904..e67a4d6 100644 (file)
--- a/libs/libnet-1.1.x/Makefile
+++ b/libs/libnet-1.1.x/Makefile
@@ -46,11 +46,9 @@ define Build/Configure
        $(call Build/Configure/Default, \
                --enable-shared \
                --enable-static \
-               --with-pf_packet=yes \
-               , \
-               ac_libnet_have_pf_packet=yes \
-               ac_cv_lbl_unaligned_fail=no \
+               --with-pf_packet=yes, \
                ac_cv_libnet_endianess=$(ENDIANESS) \
+               ac_libnet_have_pf_packet=yes \
                ac_libnet_have_packet_socket=yes \
        )
 endef

diff --git a/libs/libusb/Makefile b/libs/libusb/Makefile
index 934658c..4966c1f 100644 (file)
--- a/libs/libusb/Makefile
+++ b/libs/libusb/Makefile
@@ -36,7 +36,6 @@ define Build/Configure
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ac_cv_c_bigendian=no \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \

diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile
index 723492e..201a555 100644 (file)
--- a/libs/mysql/Makefile
+++ b/libs/mysql/Makefile
@@ -48,10 +48,6 @@ define Build/Configure
                CXXFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ac_atomic_add=yes \
-               ac_atomic_sub=yes \
-               ac_cv_sys_restartable_syscalls=yes \
-               ac_cv_conv_longlong_to_float=yes \
                mysql_cv_compress=yes \
                mysql_cv_gethostname_style=glibc2 \
                ./configure \

diff --git a/libs/ncurses/Makefile b/libs/ncurses/Makefile
index a06e29a..2eee9cd 100644 (file)
--- a/libs/ncurses/Makefile
+++ b/libs/ncurses/Makefile
@@ -37,6 +37,7 @@ define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        (cd $(PKG_BUILD_DIR); rm -f config.cache; \
+               CONFIG_SITE="" \
                ./configure \
                        --target=$(GNU_HOST_NAME) \
                        --host=$(GNU_HOST_NAME) \
@@ -80,7 +81,6 @@ define Build/Compile
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ac_cv_linux_vers="2" \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \

diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile
index 8702315..35006b2 100644 (file)
--- a/libs/openldap/Makefile
+++ b/libs/openldap/Makefile
@@ -119,7 +119,6 @@ define Build/Compile
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \
-               ac_cv_func_memcmp_clean="yes" \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \

diff --git a/libs/radiusclient-ng/Makefile b/libs/radiusclient-ng/Makefile
index 57d4b8b..9af8543 100644 (file)
--- a/libs/radiusclient-ng/Makefile
+++ b/libs/radiusclient-ng/Makefile
@@ -62,7 +62,6 @@ define Build/Configure
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ac_cv_func_getdomainname=yes \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \

diff --git a/libs/serdisplib/Makefile b/libs/serdisplib/Makefile
index 5a4ac3e..41df8d2 100644 (file)
--- a/libs/serdisplib/Makefile
+++ b/libs/serdisplib/Makefile
@@ -36,7 +36,6 @@ define Build/Configure
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ac_cv_func_malloc_0_nonnull=yes \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \

diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile
index aa3fb49..38b4487 100644 (file)
--- a/multimedia/gphoto2/Makefile
+++ b/multimedia/gphoto2/Makefile
@@ -31,11 +31,6 @@ define Package/gphoto2
   URL:=http://www.gphoto.org/
 endef
 
-BIG_ENDIAN:=no
-ifeq ($(CONFIG_BIG_ENDIAN),y)
-  BIG_ENDIAN:=yes
-endif
-
 define Build/Configure
        $(call Build/Configure/Default, \
                --without-libiconv-prefix \
@@ -47,8 +42,6 @@ define Build/Configure
                LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \
                POPT_CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \
                POPT_LIBS="$$$$LDFLAGS -lpopt" \
-               ac_cv_c_bigendian="$(BIG_ENDIAN)" \
-               ac_cv_func_malloc_0_nonnull=yes \
        )
 endef
 

diff --git a/net/chillispot/Makefile b/net/chillispot/Makefile
index e362767..3f6238e 100644 (file)
--- a/net/chillispot/Makefile
+++ b/net/chillispot/Makefile
@@ -48,9 +48,6 @@ define Build/Configure
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ac_cv_func_malloc_0_nonnull=yes \
-               ac_cv_func_memcmp_working=yes \
-               ac_cv_func_setvbuf_reversed=no \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \

diff --git a/net/click/Makefile b/net/click/Makefile
index cfa49e8..61a5a73 100644 (file)
--- a/net/click/Makefile
+++ b/net/click/Makefile
@@ -41,13 +41,8 @@ define Package/roofnet
   URL:=http://pdos.csail.mit.edu/roofnet/
 endef
 
-CONF_OPTS= \
-               ac_cv_int64_t=no \
-               ac_cv_sizeof_off_t=4
-
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \
-               $(CONF_OPTS) \
                ./configure; \
                cp include/click/config.h include/click/config-host.h; \
                rm -rf config.{cache,status} ; \

diff --git a/net/dhcp-forwarder/Makefile b/net/dhcp-forwarder/Makefile
index ef6104d..c400250 100644 (file)
--- a/net/dhcp-forwarder/Makefile
+++ b/net/dhcp-forwarder/Makefile
@@ -35,7 +35,7 @@ define Package/dhcp-forwarder/conffiles
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,,ac_cv_func_malloc_0_nonnull="yes")
+       $(call Build/Configure/Default)
 endef
 
 define Build/Compile

diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 2a610d2..67a7d84 100644 (file)
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -32,14 +32,16 @@ characteristics.\\\
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
---disable-static \
---disable-rpath \
---disable-multicast \
---disable-threads,CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \
-LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-LIBS="-luClibc++ -lc -lm -lgcc_s" \
-ac_cv_func_malloc_0_nonnull=yes)
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --disable-static \
+               --disable-rpath \
+               --disable-multicast \
+               --disable-threads, \
+               CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \
+               LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               LIBS="-luClibc++ -lc -lm -lgcc_s" \
+       )
 endef
 
 define Build/Compile   

diff --git a/net/miau/Makefile b/net/miau/Makefile
index 5b59cb0..4ecd2ef 100644 (file)
--- a/net/miau/Makefile
+++ b/net/miau/Makefile
@@ -34,12 +34,13 @@ for IRC-networks.\\\
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-automode \
---enable-releasenick \
---enable-uptime \
---enable-privlog \
---enable-onconnect,ac_cv_func_malloc_0_nonnull=yes \
-ac_cv_func_realloc_0_nonnull=yes)
+       $(call Build/Configure/Default, \
+               --enable-automode \
+               --enable-releasenick \
+               --enable-uptime \
+               --enable-privlog \
+               --enable-onconnect \
+       )
 endef
 
 

diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile
index b16107a..29f4899 100644 (file)
--- a/net/nfs-kernel-server/Makefile
+++ b/net/nfs-kernel-server/Makefile
@@ -40,10 +40,12 @@ define Package/nfs-kernel-server/conffiles
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-static --enable-shared --disable-nfsv4 \
---disable-gss,ac_cv_func_malloc_0_nonnull=yes \
-ac_cv_func_memcmp_working=yes \
-ac_cv_func_setvbuf_reversed=no)
+       $(call Build/Configure/Default, \
+               --enable-static \
+               --enable-shared \
+               --disable-nfsv4 \
+               --disable-gss \
+       )
 endef
 
 define Build/Compile

diff --git a/net/ptunnel/Makefile b/net/ptunnel/Makefile
index a6dbdf9..2ce4070 100644 (file)
--- a/net/ptunnel/Makefile
+++ b/net/ptunnel/Makefile
@@ -35,7 +35,7 @@ define Package/ptunnel
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
+       $(call Build/Configure/Default,--enable-shared \
                --disable-static \
                --with-gnu-ld, \
                $(TARGET_CONFIGURE_OPTS) \
@@ -44,8 +44,8 @@ $(call Build/Configure/Default,--enable-shared \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ac_cv_linux_vers=2 \
-               td_cv_buggygetaddrinfo="no")
+               td_cv_buggygetaddrinfo="no" \
+       )
 endef
 
 define Build/Compile   

diff --git a/net/raddump/Makefile b/net/raddump/Makefile
index 11e1bb3..7ccb43c 100644 (file)
--- a/net/raddump/Makefile
+++ b/net/raddump/Makefile
@@ -34,9 +34,7 @@ define Package/raddump
 endef
 
 define Build/Configure 
-$(call Build/Configure/Default,,ac_cv_c_bigendian=no \
-                ac_cv_func_malloc_0_nonnull=yes \
-                ac_cv_func_realloc_0_nonnull=yes)
+       $(call Build/Configure/Default)
 endef
 
 define Build/Compile   

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 30333ff..1a45af8 100644 (file)
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -54,12 +54,6 @@ define Build/Configure
  (cd $(PKG_BUILD_DIR)/src ; rm -rf config.{cache,status}; \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS)" \
-                ac_cv_func_setvbuf_reversed=no \
-                ac_cv_sizeof_unsigned_short=2 \
-                ac_cv_sizeof_unsigned_int=4 \
-                ac_cv_sizeof_unsigned_long=4 \
-                ac_cv_linux_kernel_pppoe=yes \
-                ac_cv_pack_bitfields_reversed=yes \
                 ./configure \
                   --target=$(GNU_TARGET_NAME) \
                   --host=$(GNU_TARGET_NAME) \

diff --git a/net/samba/Makefile b/net/samba/Makefile
index 613d546..0f22184 100644 (file)
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -82,9 +82,6 @@ define Build/Compile
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-lgcc_s -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
                ac_cv_lib_cups_httpConnect=no \
-               ac_cv_sizeof_int=4 \
-               ac_cv_sizeof_long=4 \
-               ac_cv_sizeof_short=2 \
                samba_cv_FTRUNCATE_NEEDS_ROOT=no \
                samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no \
                samba_cv_HAVE_BROKEN_GETGROUPS=no \

diff --git a/net/slurm/Makefile b/net/slurm/Makefile
index 8a3b40b..5cdf4ac 100644 (file)
--- a/net/slurm/Makefile
+++ b/net/slurm/Makefile
@@ -47,7 +47,6 @@ define Build/Configure
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
                LIBS="-lncurses" \
-               ac_cv_func_malloc_0_nonnull=yes \
                ac_cv_lib_ncurses_use_default_colors=yes \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \

diff --git a/net/squid/Makefile b/net/squid/Makefile
index 7384d12..f762b71 100644 (file)
--- a/net/squid/Makefile
+++ b/net/squid/Makefile
@@ -138,26 +138,7 @@ define Build/Configure
                --enable-ntlm-auth-helpers="fakeauth SMB winbind" \
                --enable-digest-auth-helpers="password" \
                --enable-external-acl-helpers="ip_user unix_group winbind_group" \
-               , \
-               ac_cv_sizeof_void_p=4 \
-               ac_cv_sizeof_short=2 \
-               ac_cv_sizeof_int=4 \
-               ac_cv_sizeof_long=4 \
-               ac_cv_sizeof_long_long=8 \
-               ac_cv_sizeof___int64=0 \
-               ac_cv_sizeof_int16_t=2 \
-               ac_cv_sizeof_uint16_t=2 \
-               ac_cv_sizeof_u_int16_t=2 \
-               ac_cv_sizeof_int32_t=4 \
-               ac_cv_sizeof_uint32_t=4 \
-               ac_cv_sizeof_u_int32_t=4 \
-               ac_cv_sizeof_int64_t=8 \
-               ac_cv_sizeof_uint64_t=8 \
-               ac_cv_sizeof_u_int64_t=8 \
-               ac_cv_func_setresuid=no \
-               ac_cv_func_va_copy=no \
-               ac_cv_func___va_copy=no \
-        )
+       )
 endef
        
 define Build/Compile   

diff --git a/net/tmsnc/Makefile b/net/tmsnc/Makefile
index 3fced85..73bafe7 100644 (file)
--- a/net/tmsnc/Makefile
+++ b/net/tmsnc/Makefile
@@ -31,17 +31,19 @@ define Package/tmsnc
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--with-libiconv-prefix=$(STAGING_DIR)/usr \
-                  --with-openssl="$(STAGING_DIR)/usr" \
-                  --with-ncurses="$(STAGING_DIR)/usr" \
-                  --with-gnu-ld, ac_cv_func_malloc_0_nonnull=yes \
-                 ac_cv_func_realloc_0_nonnull=yes)
+       $(call Build/Configure/Default, \
+               --with-libiconv-prefix=$(STAGING_DIR)/usr \
+               --with-openssl="$(STAGING_DIR)/usr" \
+               --with-ncurses="$(STAGING_DIR)/usr" \
+               --with-gnu-ld \
+       )
 endef
 
 define Build/Compile
-$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \
+       $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" \
                CFLAGS="$(TARGET_CFLAGS)" \
-               install)
+               install \
+       )
        rm -rf $(PKG_INSTALL_DIR)/usr/man
 endef
 

diff --git a/net/vncrepeater/Makefile b/net/vncrepeater/Makefile
index ead836f..e221c1a 100644 (file)
--- a/net/vncrepeater/Makefile
+++ b/net/vncrepeater/Makefile
@@ -42,7 +42,8 @@ endef
 
 define Build/Compile
 $(call Build/Compile/Default, \
-               CFLAGS="$(TARGET_CFLAGS)" \
+               CFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti -nostdinc++" \
+               STAGING_DIR="$(STAGING_DIR)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                repeater)
 endef

diff --git a/net/wccpd/Makefile b/net/wccpd/Makefile
index 62ae7c0..c1c8f45 100644 (file)
--- a/net/wccpd/Makefile
+++ b/net/wccpd/Makefile
@@ -34,10 +34,12 @@ define Package/wccpd
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
-                        --enable-static \
-                        --disable-rpath \
-                        --with-gnu-ld,ac_cv_func_setpgrp_void=yes)
+       $(call Build/Configure/Default,
+               --enable-shared \
+               --enable-static \
+               --disable-rpath \
+               --with-gnu-ld \
+       )
 endef
 
 define Build/Compile

diff --git a/net/wifidog/Makefile b/net/wifidog/Makefile
index 45e0421..a538e8f 100644 (file)
--- a/net/wifidog/Makefile
+++ b/net/wifidog/Makefile
@@ -39,9 +39,7 @@ define Package/wifidog/conffiles
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,,ac_cv_func_malloc_0_nonnull=yes \
-               ac_cv_func_memcmp_working=yes \
-               ac_cv_func_setvbuf_reversed=no)
+       $(call Build/Configure/Default)
 endef
 
 define Build/Compile

diff --git a/sound/madplay/Makefile b/sound/madplay/Makefile
index c446727..401aad0 100644 (file)
--- a/sound/madplay/Makefile
+++ b/sound/madplay/Makefile
@@ -35,19 +35,19 @@ full support for ID3 tags.\\\
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
---disable-static \
---with-gnu-ld \
---disable-rpath \
---disable-debugging \
---disable-profiling \
---disable-experimental \
---without-libiconv-prefix \
---without-libintl-prefix \
---without-alsa \
---without-esd,LIBS="-lz" \
-ac_cv_linux_vers=2 \
-td_cv_buggygetaddrinfo="no")
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --disable-static \
+               --with-gnu-ld \
+               --disable-rpath \
+               --disable-debugging \
+               --disable-profiling \
+               --disable-experimental \
+               --without-libiconv-prefix \
+               --without-libintl-prefix \
+               --without-alsa \
+               --without-esd,LIBS="-lz" \
+       )
 endef
 
 define Build/Compile

diff --git a/sound/mt-daapd/Makefile b/sound/mt-daapd/Makefile
index c6be213..23ad6f3 100644 (file)
--- a/sound/mt-daapd/Makefile
+++ b/sound/mt-daapd/Makefile
@@ -37,16 +37,18 @@ define Package/mt-daapd/conffiles
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
-                        --disable-static \
-                        --enable-mdns \
-                        --enable-howl \
-                        --with-id3tag="$(STAGING_DIR)/usr" \
-                        --with-gdbm-includes="$(STAGING_DIR)/usr/include" \
-                        --with-gdbm-libs="$(STAGING_DIR)/usr/lib" \
-                        --with-howl-includes="$(STAGING_DIR)/usr/include/howl" \
-                        --with-howl-libs="$(STAGING_DIR)/usr/lib" \
-                        --without-static-libs,ac_cv_func_setpgrp_void=yes)
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --disable-static \
+               --enable-mdns \
+               --enable-howl \
+               --with-id3tag="$(STAGING_DIR)/usr" \
+               --with-gdbm-includes="$(STAGING_DIR)/usr/include" \
+               --with-gdbm-libs="$(STAGING_DIR)/usr/lib" \
+               --with-howl-includes="$(STAGING_DIR)/usr/include/howl" \
+               --with-howl-libs="$(STAGING_DIR)/usr/lib" \
+               --without-static-libs \
+       )
 endef
 
 define Build/Compile   

diff --git a/utils/fetchmail/Makefile b/utils/fetchmail/Makefile
index e541e81..048fc3e 100644 (file)
--- a/utils/fetchmail/Makefile
+++ b/utils/fetchmail/Makefile
@@ -32,12 +32,11 @@ define Package/fetchmail
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-fallback=procmail --without-hesiod,ac_cv_c_bigendian=no \
-ac_cv_sizeof_off_t=8 \
-ac_cv_sizeof_int=4 \
-ac_cv_sizeof_long=4 \
-ac_cv_path_procmail=/usr/sbin/procmail \
-)
+       $(call Build/Configure/Default, \
+               --enable-fallback=procmail \
+               --without-hesiod, \
+               ac_cv_path_procmail=/usr/sbin/procmail \
+       )
 endef
 
 define Build/Compile

diff --git a/utils/gnupg/Makefile b/utils/gnupg/Makefile
index 43b6035..970be4e 100644 (file)
--- a/utils/gnupg/Makefile
+++ b/utils/gnupg/Makefile
@@ -36,8 +36,6 @@ define Build/Configure
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ac_cv_c_bigendian=no \
-               ac_cv_sizeof_off_t=8 \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \

diff --git a/utils/mutt/Makefile b/utils/mutt/Makefile
index f54b739..87c0b87 100644 (file)
--- a/utils/mutt/Makefile
+++ b/utils/mutt/Makefile
@@ -31,14 +31,13 @@ define Package/mutt
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--includedir=$(PKG_BUILD_DIR)/. \
+       $(call Build/Configure/Default, \
+               --includedir=$(PKG_BUILD_DIR)/. \
                --oldincludedir=$(PKG_BUILD_DIR)/. \
                --enable-pop \
                --enable-imap \
-               --with-ssl,ac_cv_c_bigendian=no \
-               ac_cv_sizeof_off_t=8 \
-               ac_cv_sizeof_int=4 \
-               ac_cv_sizeof_long=4)
+               --with-ssl \
+       )
 endef
 
 define Package/mutt/install

diff --git a/utils/rrdcollect/Makefile b/utils/rrdcollect/Makefile
index a38d07d..519d84d 100644 (file)
--- a/utils/rrdcollect/Makefile
+++ b/utils/rrdcollect/Makefile
@@ -59,20 +59,22 @@ define Package/rrdcollect-example/conffiles
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-shared \
-                        --disable-static \
-                        --disable-rpath \
-                        --with-gnu-ld \
-                        --enable-exec \
-                        --without-rrdtool \
-                        --with-librrd \
-                        --without-libpcre \
-                        --without-libpcap, CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --disable-static \
+               --disable-rpath \
+               --with-gnu-ld \
+               --enable-exec \
+               --without-rrdtool \
+               --with-librrd \
+               --without-libpcre \
+               --without-libpcap, \
+               CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
                LIBS="$(RRDTOOL_LIBS) -lz" \
                PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
-               ac_cv_func_malloc_0_nonnull=yes)
+       )
 endef
 
 define Build/Compile   

diff --git a/utils/screen/Makefile b/utils/screen/Makefile
index 3dd0bfb..6b1b5ac 100644 (file)
--- a/utils/screen/Makefile
+++ b/utils/screen/Makefile
@@ -35,7 +35,6 @@ endef
 define Build/Configure 
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
-               $(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_$(flag)=yes ) \
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib" \

diff --git a/utils/usbutils/Makefile b/utils/usbutils/Makefile
index 28f44fd..4087887 100644 (file)
--- a/utils/usbutils/Makefile
+++ b/utils/usbutils/Makefile
@@ -37,7 +37,6 @@ define Build/Configure
                CFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ac_cv_func_malloc_0_nonnull=yes \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \

diff --git a/utils/vim/Makefile b/utils/vim/Makefile
index aa6f526..df3a877 100644 (file)
--- a/utils/vim/Makefile
+++ b/utils/vim/Makefile
@@ -31,21 +31,21 @@ define Package/vim
 endef
 
 define Build/Configure
-$(call Build/Configure/Default,--enable-min-features \
+       $(call Build/Configure/Default, \
+                       --enable-min-features \
                        --disable-gui \
                        --without-x \
                        --disable-multibyte \
                        --disable-cscope \
                        --disable-gpm \
-                       --with-tlib=ncurses,ac_cv_c_bigendian=no \
-                       ac_cv_sizeof_off_t=8 \
-                       ac_cv_sizeof_int=4)
+                       --with-tlib=ncurses \
+       )
 endef
 
 define Package/vim/install     
        mkdir -p $(1)/usr/bin
-       mkdir -p $(1)//usr/share/vim
-       $(CP) ./files/vimrc $(1)//usr/share/vim
+       mkdir -p $(1)/usr/share/vim
+       $(CP) ./files/vimrc $(1)/usr/share/vim
        $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/bin/
 endef