diff options
| -rw-r--r-- | ares/m4/reentrant.m4 | 28 | ||||
| -rw-r--r-- | m4/reentrant.m4 | 45 |
2 files changed, 72 insertions, 1 deletions
diff --git a/ares/m4/reentrant.m4 b/ares/m4/reentrant.m4 index 01d2136a7..8bffc9b1d 100644 --- a/ares/m4/reentrant.m4 +++ b/ares/m4/reentrant.m4 @@ -83,7 +83,6 @@ dnl makes function strtok_r compiler visible. AC_DEFUN([CHECK_NEED_REENTRANT_STRTOK_R], [ # AC_MSG_NOTICE([DEBUG:]) - AC_MSG_NOTICE([DEBUG:]) AC_LINK_IFELSE([ AC_LANG_FUNC_LINK_TRY([strtok_r]) ],[ @@ -716,6 +715,19 @@ AC_DEFUN([CHECK_NEED_REENTRANT_GETPROTOBYNAME_R], [ #include <sys/types.h> #include <netdb.h> ]],[[ + getprotobyname_r(0, 0, 0); + ]]) + ],[ + AC_MSG_NOTICE([DEBUG: getprotobyname_r proto wout finds... 3 args]) + tmp_getprotobyname_r="done" + ]) + fi + if test "$tmp_getprotobyname_r" = "proto_wout_def"; then + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ +#include <sys/types.h> +#include <netdb.h> + ]],[[ getprotobyname_r(0, 0, 0, 0); ]]) ],[ @@ -744,6 +756,20 @@ AC_DEFUN([CHECK_NEED_REENTRANT_GETPROTOBYNAME_R], [ #include <sys/types.h> #include <netdb.h> ]],[[ + getprotobyname_r(0, 0, 0); + ]]) + ],[ + AC_MSG_NOTICE([DEBUG: getprotobyname_r proto with finds... 3 args]) + tmp_getprotobyname_r="needs_reentrant" + ]) + fi + if test "$tmp_getprotobyname_r" = "proto_with_def"; then + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ +#define _REENTRANT +#include <sys/types.h> +#include <netdb.h> + ]],[[ getprotobyname_r(0, 0, 0, 0); ]]) ],[ diff --git a/m4/reentrant.m4 b/m4/reentrant.m4 index 8da25bae7..2e2033a2a 100644 --- a/m4/reentrant.m4 +++ b/m4/reentrant.m4 @@ -737,6 +737,28 @@ AC_DEFUN([CHECK_NEED_REENTRANT_GETPROTOBYNAME_R], [ #include <sys/types.h> #include <netdb.h> ]],[[ + getprotobyname_r(0, 0, 0); + ]]) + ],[ + AC_MSG_NOTICE([DEBUG: getprotobyname_r proto wout finds... 3 args]) + tmp_getprotobyname_r="done" + ],[ + case $host in + *-*-osf* | *-*-aix*) + AC_MSG_NOTICE([DEBUG: getprotobyname_r proto wout fails... 3 args]) + echo "-------------------" >&6 + sed 's/^/| /' conftest.err >&6 + echo "-------------------" >&6 + ;; + esac + ]) + fi + if test "$tmp_getprotobyname_r" = "proto_wout_def"; then + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ +#include <sys/types.h> +#include <netdb.h> + ]],[[ getprotobyname_r(0, 0, 0, 0); ]]) ],[ @@ -783,6 +805,29 @@ AC_DEFUN([CHECK_NEED_REENTRANT_GETPROTOBYNAME_R], [ #include <sys/types.h> #include <netdb.h> ]],[[ + getprotobyname_r(0, 0, 0); + ]]) + ],[ + AC_MSG_NOTICE([DEBUG: getprotobyname_r proto with finds... 3 args]) + tmp_getprotobyname_r="needs_reentrant" + ],[ + case $host in + *-*-osf* | *-*-aix*) + AC_MSG_NOTICE([DEBUG: getprotobyname_r proto with fails... 3 args]) + echo "-------------------" >&6 + sed 's/^/| /' conftest.err >&6 + echo "-------------------" >&6 + ;; + esac + ]) + fi + if test "$tmp_getprotobyname_r" = "proto_with_def"; then + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ +#define _REENTRANT +#include <sys/types.h> +#include <netdb.h> + ]],[[ getprotobyname_r(0, 0, 0, 0); ]]) ],[ |