merge of '59b19c7d48e754418caf1f4214b1ce53d2cca5c4'

     and 'f4a044e0ef8b886ef1bdc74ae09f12874ddf7130'

12 files changed, 5 insertions, 17 deletions

diff --git a/site/arm-linux b/site/arm-linux
index ceebbecf6b..89a0eef0ed 100644
--- a/site/arm-linux
+++ b/site/arm-linux
@@ -38,7 +38,6 @@ ac_cv_uchar=${ac_cv_uchar=no}
 ac_cv_uint=${ac_cv_uint=yes}
 ac_cv_ulong=${ac_cv_ulong=yes}
 ac_cv_ushort=${ac_cv_ushort=yes}
-mr_cv_target_elf=${mr_cv_target_elf=yes}
 ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
 
 # samba
diff --git a/site/arm-linux-uclibc b/site/arm-linux-uclibc
index 3ebf6f4d6c..81d2c54aae 100644
--- a/site/arm-linux-uclibc
+++ b/site/arm-linux-uclibc
@@ -23,8 +23,6 @@ ac_cv_uint=${ac_cv_uint=yes}
 ac_cv_ulong=${ac_cv_ulong=yes}
 ac_cv_ushort=${ac_cv_ushort=yes}
 
-mr_cv_target_elf=${mr_cv_target_elf=yes}
-
 ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
 
 # samba
diff --git a/site/armeb-linux b/site/armeb-linux
index fd3d2b18d3..1b170ab191 100644
--- a/site/armeb-linux
+++ b/site/armeb-linux
@@ -26,8 +26,6 @@ ac_cv_uint=${ac_cv_uint=yes}
 ac_cv_ulong=${ac_cv_ulong=yes}
 ac_cv_ushort=${ac_cv_ushort=yes}
 
-mr_cv_target_elf=${mr_cv_target_elf=yes}
-
 ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
 
 # samba
diff --git a/site/armeb-linux-uclibc b/site/armeb-linux-uclibc
index 3b2bc6b0e5..1ab44977dd 100644
--- a/site/armeb-linux-uclibc
+++ b/site/armeb-linux-uclibc
@@ -26,8 +26,6 @@ ac_cv_uint=${ac_cv_uint=yes}
 ac_cv_ulong=${ac_cv_ulong=yes}
 ac_cv_ushort=${ac_cv_ushort=yes}
 
-mr_cv_target_elf=${mr_cv_target_elf=yes}
-
 ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
 
 # samba
diff --git a/site/common b/site/common
index e69de29bb2..f73a36abed 100644
--- a/site/common
+++ b/site/common
@@ -0,0 +1,2 @@
+# libelf
+mr_cv_target_elf=${mr_cv_target_elf=yes}
diff --git a/site/ix86-common b/site/ix86-common
index 496c2e3403..96a36cf9c8 100644
--- a/site/ix86-common
+++ b/site/ix86-common
@@ -107,6 +107,9 @@ ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
 dpkg_cv_va_copy=${ac_cv_va_copy=no}
 dpkg_cv___va_copy=${ac_cv___va_copy=yes}
 
+# enca
+yeti_cv_func_scanf_modif_size_t=yes
+
 # ettercap
 ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes}
 
diff --git a/site/powerpc-linux b/site/powerpc-linux
index dd2c811706..92dd1fd9d0 100644
--- a/site/powerpc-linux
+++ b/site/powerpc-linux
@@ -33,8 +33,6 @@ ac_cv_uint=${ac_cv_uint=yes}
 ac_cv_ulong=${ac_cv_ulong=yes}
 ac_cv_ushort=${ac_cv_ushort=yes}
 
-mr_cv_target_elf=${mr_cv_target_elf=yes}
-
 ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
 cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes}
 
diff --git a/site/powerpc-linux-uclibc b/site/powerpc-linux-uclibc
index 97e425f35c..5bdc913652 100644
--- a/site/powerpc-linux-uclibc
+++ b/site/powerpc-linux-uclibc
@@ -28,8 +28,6 @@ ac_cv_uint=${ac_cv_uint=yes}
 ac_cv_ulong=${ac_cv_ulong=yes}
 ac_cv_ushort=${ac_cv_ushort=yes}
 
-mr_cv_target_elf=${mr_cv_target_elf=yes}
-
 ac_cv_c_littleendian=${ac_cv_c_littleendian=no}
 ac_cv_c_bigendian=${ac_cv_c_bigendian=yes}
 ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
diff --git a/site/sh-common b/site/sh-common
index 7165542ebe..76c464da20 100644
--- a/site/sh-common
+++ b/site/sh-common
@@ -30,8 +30,6 @@ ac_cv_uint=${ac_cv_uint=yes}
 ac_cv_ulong=${ac_cv_ulong=yes}
 ac_cv_ushort=${ac_cv_ushort=yes}
 
-mr_cv_target_elf=${mr_cv_target_elf=yes}
-
 ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
 
 # apache
diff --git a/site/sparc-linux b/site/sparc-linux
index c717ebffab..491dc74bf4 100644
--- a/site/sparc-linux
+++ b/site/sparc-linux
@@ -35,8 +35,6 @@ ac_cv_uint=${ac_cv_uint=yes}
 ac_cv_ulong=${ac_cv_ulong=yes}
 ac_cv_ushort=${ac_cv_ushort=yes}
 
-mr_cv_target_elf=${mr_cv_target_elf=yes}
-
 ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
 cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes}
 
diff --git a/site/x86_64-linux b/site/x86_64-linux
index 86ae6231ba..e84371e0fd 100644
--- a/site/x86_64-linux
+++ b/site/x86_64-linux
@@ -62,7 +62,6 @@ glib_cv___va_copy=${glib_cv___va_copy=yes}
 glib_cv_va_copy=${glib_cv_va_copy=yes}
 glib_cv_va_val_copy=${glib_cv_va_val_copy=no}
 lftp_cv_va_copy=${lftp_cv_va_copy=yes}
-mr_cv_target_elf=${mr_cv_target_elf=yes}
 nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
 samba_cv_HAVE_VA_COPY=${samba_cv_HAVE_VA_COPY=yes}
 screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}
diff --git a/site/x86_64-linux-uclibc b/site/x86_64-linux-uclibc
index e88ed24ffb..fe235d05e2 100644
--- a/site/x86_64-linux-uclibc
+++ b/site/x86_64-linux-uclibc
@@ -61,7 +61,6 @@ glib_cv___va_copy=${glib_cv___va_copy=yes}
 glib_cv_va_copy=${glib_cv_va_copy=yes}
 glib_cv_va_val_copy=${glib_cv_va_val_copy=no}
 lftp_cv_va_copy=${lftp_cv_va_copy=yes}
-mr_cv_target_elf=${mr_cv_target_elf=yes}
 nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
 samba_cv_HAVE_VA_COPY=${samba_cv_HAVE_VA_COPY=yes}
 screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}