Bring upstream version tagged ACARC_2006_07_16 through from vendor branch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-08-16 19:06:23 +00:00
parent b98bd6af23
commit 6a4d465c26

View File

@@ -19,41 +19,49 @@ dnl @version 2001-08-20
dnl @license GPLWithACException dnl @license GPLWithACException
AC_DEFUN([AC_raf_FUNC_WHICH_GETSERVBYNAME_R], AC_DEFUN([AC_raf_FUNC_WHICH_GETSERVBYNAME_R],
[AC_CHECK_FUNC(getservbyname_r, [AC_CACHE_CHECK(for getservbyname_r, ac_cv_func_which_getservbyname_r, [
[AC_TRY_COMPILE([#include <netdb.h>], AC_CHECK_FUNC(getservbyname_r, [
[ AC_TRY_COMPILE([
char *name; # include <netdb.h>
char *proto; ], [
struct servent *se;
struct servent_data data; char *name;
(void) getservbyname_r(name, proto, se, &data); char *proto;
], struct servent *se;
ac_cv_func_which_getservbyname_r=four, struct servent_data data;
[AC_TRY_COMPILE([#include <netdb.h>], (void) getservbyname_r(name, proto, se, &data);
[
char *name; ],ac_cv_func_which_getservbyname_r=four,
char *proto; [
struct servent *se, *res; AC_TRY_COMPILE([
char buffer[2048]; # include <netdb.h>
int buflen = 2048; ], [
(void) getservbyname_r(name, proto, se, buffer, buflen, &res); char *name;
], char *proto;
ac_cv_func_which_getservbyname_r=six, struct servent *se, *res;
[AC_TRY_COMPILE([#include <netdb.h>], char buffer[2048];
[ int buflen = 2048;
char *name; (void) getservbyname_r(name, proto, se, buffer, buflen, &res)
char *proto; ],ac_cv_func_which_getservbyname_r=six,
struct servent *se;
char buffer[2048]; [
int buflen = 2048; AC_TRY_COMPILE([
(void) getservbyname_r(name, proto, se, buffer, buflen) # include <netdb.h>
], ], [
ac_cv_func_which_getservbyname_r=five, char *name;
ac_cv_func_which_getservbyname_r=no char *proto;
)] struct servent *se;
)] char buffer[2048];
)], int buflen = 2048;
ac_cv_func_which_getservbyname_r=no) (void) getservbyname_r(name, proto, se, buffer, buflen)
],ac_cv_func_which_getservbyname_r=five,ac_cv_func_which_getservbyname_r=no)
]
)
]
)]
,ac_cv_func_which_getservbyname_r=no)])
if test $ac_cv_func_which_getservbyname_r = six; then if test $ac_cv_func_which_getservbyname_r = six; then
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_6) AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_6)
@@ -61,6 +69,7 @@ elif test $ac_cv_func_which_getservbyname_r = five; then
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_5) AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_5)
elif test $ac_cv_func_which_getservbyname_r = four; then elif test $ac_cv_func_which_getservbyname_r = four; then
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_4) AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_4)
fi fi
]) ])