diff --git a/acinclude.m4 b/acinclude.m4 index cc3fc2fa0092b1bf403c833c0b6415256d7e73b5..d8f6682aba93bc719902dbb175f419ca0a466301 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2712,30 +2712,6 @@ _EOF ]) -dnl CURL_INCLUDES_INTTYPES -dnl ------------------------------------------------- -dnl Set up variable with list of headers that must be -dnl included when inttypes.h is to be included. - -AC_DEFUN([CURL_INCLUDES_INTTYPES], [ -curl_includes_inttypes="\ -/* includes start */ -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_INTTYPES_H -# include <inttypes.h> -#endif -/* includes end */" - AC_CHECK_HEADERS( - sys/types.h stdint.h inttypes.h, - [], [], [$curl_includes_inttypes]) -]) - - dnl CURL_CONFIGURE_LONG dnl ------------------------------------------------- dnl Find out the size of long as reported by sizeof() and define diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index a9a16a98167889eb45dc199a9490d6345ad07a68..35237300013465eca5a94eadee5afe23128954f0 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -22,7 +22,7 @@ #*************************************************************************** # File version for 'aclocal' use. Keep it a single number. -# serial 46 +# serial 47 dnl CURL_INCLUDES_ARPA_INET @@ -103,6 +103,30 @@ curl_includes_ifaddrs="\ ]) +dnl CURL_INCLUDES_INTTYPES +dnl ------------------------------------------------- +dnl Set up variable with list of headers that must be +dnl included when inttypes.h is to be included. + +AC_DEFUN([CURL_INCLUDES_INTTYPES], [ +curl_includes_inttypes="\ +/* includes start */ +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#ifdef HAVE_STDINT_H +# include <stdint.h> +#endif +#ifdef HAVE_INTTYPES_H +# include <inttypes.h> +#endif +/* includes end */" + AC_CHECK_HEADERS( + sys/types.h stdint.h inttypes.h, + [], [], [$curl_includes_inttypes]) +]) + + dnl CURL_INCLUDES_NETDB dnl ------------------------------------------------- dnl Set up variable with list of headers that must be