diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R.h
new file mode 100644
index 0000000..c74804a
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R.h
@@ -0,0 +1,16 @@
+// HAVE_GETHOSTBYNAME_R : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_GETHOSTBYNAME_R
+
+/* Since Linux/glibc 2.1, SunOS, AIX and HPUX. 
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 1)       || \
+    defined(__SunOS) && defined(__SunOS_5_5) || \   
+    defined(_AIX) || \ 
+    defined(__hpux)  
+#  define HAVE_GETHOSTBYNAME_R 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R_3_ARG.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R_3_ARG.h
new file mode 100644
index 0000000..7c52be1
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R_3_ARG.h
@@ -0,0 +1,13 @@
+// HAVE_GETHOSTBYNAME_R_3_ARG : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_GETHOSTBYNAME_R_3_ARG
+
+/* AIX4, HPUX 10 uses 3 args
+ */
+#if defined(_AIX) || defined(__hpux)
+#  define HAVE_GETHOSTBYNAME_R_3_ARG 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R_5_ARG.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R_5_ARG.h
new file mode 100644
index 0000000..e51c4ed
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R_5_ARG.h
@@ -0,0 +1,13 @@
+// HAVE_GETHOSTBYNAME_R_5_ARG : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_GETHOSTBYNAME_R_5_ARG
+
+/* Solaris uses 5 args starting from at latest 5.5 could not find earlier.
+ */
+#if defined(__SunOS) && defined(__SunOS_5_5)
+#  define HAVE_GETHOSTBYNAME_R_5_ARG 1
+#endif
diff --git a/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R_6_ARG.h b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R_6_ARG.h
new file mode 100644
index 0000000..c271f5a
--- /dev/null
+++ b/libbuild2-autoconf/libbuild2/autoconf/checks/HAVE_GETHOSTBYNAME_R_6_ARG.h
@@ -0,0 +1,13 @@
+// HAVE_GETHOSTBYNAME_R_6_ARG : BUILD2_AUTOCONF_LIBC_VERSION
+
+#ifndef BUILD2_AUTOCONF_LIBC_VERSION
+#  error BUILD2_AUTOCONF_LIBC_VERSION appears to be conditionally included
+#endif
+
+#undef HAVE_GETHOSTBYNAME_R_6_ARG
+
+/* Since Linux/glibc 2.1
+ */
+#if BUILD2_AUTOCONF_GLIBC_PREREQ(2, 1)
+#  define HAVE_GETHOSTBYNAME_R_6_ARG 1
+#endif