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([
# include <netdb.h>
], [
char *name; char *name;
char *proto; char *proto;
struct servent *se; struct servent *se;
struct servent_data data; struct servent_data data;
(void) getservbyname_r(name, proto, se, &data); (void) getservbyname_r(name, proto, se, &data);
],
ac_cv_func_which_getservbyname_r=four, ],ac_cv_func_which_getservbyname_r=four,
[AC_TRY_COMPILE([#include <netdb.h>],
[ [
AC_TRY_COMPILE([
# include <netdb.h>
], [
char *name; char *name;
char *proto; char *proto;
struct servent *se, *res; struct servent *se, *res;
char buffer[2048]; char buffer[2048];
int buflen = 2048; int buflen = 2048;
(void) getservbyname_r(name, proto, se, buffer, buflen, &res); (void) getservbyname_r(name, proto, se, buffer, buflen, &res)
], ],ac_cv_func_which_getservbyname_r=six,
ac_cv_func_which_getservbyname_r=six,
[AC_TRY_COMPILE([#include <netdb.h>],
[ [
AC_TRY_COMPILE([
# include <netdb.h>
], [
char *name; char *name;
char *proto; char *proto;
struct servent *se; struct servent *se;
char buffer[2048]; char buffer[2048];
int buflen = 2048; int buflen = 2048;
(void) getservbyname_r(name, proto, se, buffer, buflen) (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=five,
ac_cv_func_which_getservbyname_r=no ]
)
]
)] )]
)] ,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
]) ])