merge of '761183d571c60b5df965993faf1c23d3f933718b'

     and 'd52a54d5f2ae378fe03f9c8d4cfb66d2d6a45d41'

5 files changed, 23 insertions, 11 deletions

diff --git a/site/arm-common b/site/arm-common
index f459e784d7..bfc141072b 100644
--- a/site/arm-common
+++ b/site/arm-common
@@ -103,11 +103,6 @@ glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4}
 glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4}
 glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
 glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes}
-glib_cv_strlcpy=${glib_cv_strlcpy=no}
-ac_cv_func_printf_unix98=${ac_cv_func_printf_unix98=yes}
-ac_cv_func_snprintf_c99=${ac_cv_func_snprintf_c99=yes}
-ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes}
-glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1}
 
 #gstreamer
 as_cv_unaligned_access=${as_cv_unaligned_access=no}
@@ -234,3 +229,9 @@ sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10}
 # xffm
 jm_cv_func_working_readdir=yes
 
+# dpkg
+dpkg_cv_va_copy=${ac_cv_va_copy=yes}
+dpkg_cv___va_copy=${ac_cv___va_copy=yes}
+
+# eds-dbus
+ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
diff --git a/site/arm-linux b/site/arm-linux
index bb9198310c..d45c8f87c2 100644
--- a/site/arm-linux
+++ b/site/arm-linux
@@ -150,10 +150,6 @@ samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
 samba_cv_USE_SETUIDX=${samba_cv_USE_SETUIDX=yes}
 samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes}
 
-# dpkg
-dpkg_cv_va_copy=${ac_cv_va_copy=yes}
-dpkg_cv___va_copy=${ac_cv___va_copy=yes}
-
 # enca
 yeti_cv_func_scanf_modif_size_t=yes
 
@@ -163,8 +159,8 @@ clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes}
 clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes}
 ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes}
 
-# dbus
-ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=no}
+#dbus
+ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
 
 # lftp
 ac_cv_file___dev_ptc_=yes
diff --git a/site/common b/site/common
index 565b053623..90766886b3 100644
--- a/site/common
+++ b/site/common
@@ -1,4 +1,5 @@
 # libelf
 mr_cv_target_elf=${mr_cv_target_elf=yes}
 
+# Normally kernels have /dev/random enabled
 ac_cv_file__dev_random=${ac_cv_file__dev_random=yes}
diff --git a/site/common-glibc b/site/common-glibc
index 37f8d87ce6..9ed7a85a87 100644
--- a/site/common-glibc
+++ b/site/common-glibc
@@ -13,5 +13,13 @@ clamav_av_have_in_port_t=${clamav_av_have_in_port_t=yes}
 clamav_av_have_in_addr_t=${clamav_av_have_in_addr_t=yes}
 ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes}
 
+# glib
+glib_cv_strlcpy=${glib_cv_strlcpy=no}
+ac_cv_func_printf_unix98=${ac_cv_func_printf_unix98=yes}
+ac_cv_func_snprintf_c99=${ac_cv_func_snprintf_c99=yes}
+ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes}
+glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1}
+glib_cv_long_long_format=${glib_cv_long_long_format=ll}
+
 # gnucash
 am_cv_scanf_lld=${am_cv_scanf_lld=yes}
diff --git a/site/ix86-common b/site/ix86-common
index 36412c9689..00c544f382 100644
--- a/site/ix86-common
+++ b/site/ix86-common
@@ -256,3 +256,9 @@ jm_cv_func_working_readdir=yes
 # xorg X11R7
 ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no}
 ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no}
+
+# eds-dbus
+ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
+
+#dbus
+ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}