Update includes from configure

2 files changed, 49 insertions, 41 deletions

diff --git a/src/configure.in b/src/configure.in
index cbc09b2f182..932797d1879 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -576,11 +576,25 @@ AC_CHECK_LIB(PW,       main)
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(limits.h unistd.h termios.h values.h sys/select.h)
-AC_CHECK_HEADERS(sys/resource.h netdb.h arpa/inet.h getopt.h)
-AC_CHECK_HEADERS(readline.h history.h dld.h crypt.h endian.h float.h)
-AC_CHECK_HEADERS(readline/readline.h readline/history.h ieeefp.h fp_class.h)
+AC_CHECK_HEADERS(arpa/inet.h)
+AC_CHECK_HEADERS(crypt.h)
+AC_CHECK_HEADERS(dld.h)
+AC_CHECK_HEADERS(endian.h)
+AC_CHECK_HEADERS(float.h)
+AC_CHECK_HEADERS(fp_class.h)
+AC_CHECK_HEADERS(getopt.h)
+AC_CHECK_HEADERS(history.h)
+AC_CHECK_HEADERS(ieeefp.h)
+AC_CHECK_HEADERS(limits.h)
+AC_CHECK_HEADERS(netdb.h)
 AC_CHECK_HEADERS(netinet/in.h)
+AC_CHECK_HEADERS(readline.h)
+AC_CHECK_HEADERS(readline/history.h)
+AC_CHECK_HEADERS(readline/readline.h)
+AC_CHECK_HEADERS(sys/select.h)
+AC_CHECK_HEADERS(termios.h)
+AC_CHECK_HEADERS(unistd.h)
+AC_CHECK_HEADERS(values.h)
 dnl ODBC headers...
 AC_CHECK_HEADERS(sys/param.h pwd.h)
 dnl
diff --git a/src/include/config.h.in b/src/include/config.h.in
index b4e8a485e2b..25e08767c35 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -59,68 +59,59 @@
  * The following is set using configure.  
  */
 
-/* Set to 1 if you have <string.h> */
-#undef HAVE_STRING_H
-
-/* Set to 1 if you have <strings.h> */
-#undef HAVE_STRINGS_H
-
-/* Set to 1 if you have <getopt.h> */
-#undef HAVE_GETOPT_H
-
-/* Set to 1 if you have <fp_class.h> */
-#undef HAVE_FP_CLASS_H
-
-/* Set to 1 if you have <netinet/in.h> */
-#undef HAVE_NETINET_IN_H
-
-/* Set to 1 if you have <ieeefp.h> */
-#undef HAVE_IEEEFP_H
-
 /* Set to 1 if you have <arpa/inet.h> */
 #undef HAVE_ARPA_INET_H
 
-/* Set to 1 if you have <netdb.h> */
-#undef HAVE_NETDB_H
-
-/* Set to 1 if you have <endian.h> */
-#undef HAVE_ENDIAN_H
-
 /* Set to 1 if you have <crypt.h> */
 #undef HAVE_CRYPT_H
 
-/* Set to 1 if you have <termios.h> */
-#undef HAVE_TERMIOS_H
+/* Set to 1 if you have <dld.h> */
+#undef HAVE_DLD_H
+
+/* Set to 1 if you have <endian.h> */
+#undef HAVE_ENDIAN_H
 
 /* Set to 1 if you have <float.h> */
 #undef HAVE_FLOAT_H
 
+/* Set to 1 if you have <fp_class.h> */
+#undef HAVE_FP_CLASS_H
+
+/* Set to 1 if you have <getopt.h> */
+#undef HAVE_GETOPT_H
+
+/* Set to 1 if you have <history.h> */
+#undef HAVE_HISTORY_H
+
+/* Set to 1 if you have <ieeefp.h> */
+#undef HAVE_IEEEFP_H
+
 /* Set to 1 if you have <limits.h> */
 #undef HAVE_LIMITS_H
 
-/* Set to 1 if  you have <values.h> */
-#undef HAVE_VALUES_H
+/* Set to 1 if you have <netdb.h> */
+#undef HAVE_NETDB_H
 
-/* Set to 1 if  you have <sys/select.h> */
-#undef HAVE_SYS_SELECT_H
+/* Set to 1 if you have <netinet/in.h> */
+#undef HAVE_NETINET_IN_H
 
 /* Set to 1 if you have <readline.h> */
 #undef HAVE_READLINE_H
 
-/* Set to 1 if you have <history.h> */
-#undef HAVE_HISTORY_H
-
 /* Set to 1 if you have <readline/history.h> */
 #undef HAVE_READLINE_HISTORY_H
 
 /* Set to 1 if you have <readline/readline.h> */
 #undef HAVE_READLINE_READLINE_H
 
-/* Set to 1 if you have libreadline and it includes history functions */
-#undef HAVE_HISTORY
+/* Set to 1 if  you have <sys/select.h> */
+#undef HAVE_SYS_SELECT_H
 
-/* Set to 1 if you have <dld.h> */
-#undef HAVE_DLD_H
+/* Set to 1 if you have <termios.h> */
+#undef HAVE_TERMIOS_H
+
+/* Set to 1 if  you have <values.h> */
+#undef HAVE_VALUES_H
 
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
@@ -131,6 +122,9 @@
 /* Define if you have the stricmp function.  */
 #undef HAVE_STRICMP
 
+/* Set to 1 if you have libreadline and it includes history functions */
+#undef HAVE_HISTORY
+
 /*
  * Block of parameters for the ODBC code.
  */