Cleaned up some erroneous stuff from previous commit, added HAVE_GETADDRINFO

        to setup.h.in.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index 364b486c107e853b95794e630785016c6269125e..ec4f726d1420b16de2c22a552a06181e2ae2f1d8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4970,11 +4970,8 @@ else
 fi
 
 AC_CHECK_FUNC(localtime_r, [ AC_DEFINE(HAVE_LOCALTIME_R) ])
 fi
 
 AC_CHECK_FUNC(localtime_r, [ AC_DEFINE(HAVE_LOCALTIME_R) ])

-AC_SUBST(HAVE_LOCALTIME_R)

 AC_CHECK_FUNC(gmtime_r, [ AC_DEFINE(HAVE_GMTIME_R) ])
 AC_CHECK_FUNC(gmtime_r, [ AC_DEFINE(HAVE_GMTIME_R) ])

-AC_SUBST(HAVE_GMTIME_R)

 AC_CHECK_FUNC(readdir_r, [ AC_DEFINE(HAVE_READDIR_R) ])
 AC_CHECK_FUNC(readdir_r, [ AC_DEFINE(HAVE_READDIR_R) ])

-AC_SUBST(HAVE_READDIR_R)

 dnl By preference, use getaddrinfo which avoids thread safety issues.
 dnl If that is not available, check for gethostbyname_r/gethostbyaddr_r
 dnl and getservbyname_r
 dnl By preference, use getaddrinfo which avoids thread safety issues.
 dnl If that is not available, check for gethostbyname_r/gethostbyaddr_r
 dnl and getservbyname_r


@@ -4987,10 +4984,6 @@ AC_CHECK_FUNC(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO),
              "x$ac_cv_func_which_gethostbyname_r" = "xunknown" ; then
           AC_CHECK_FUNC(gethostbyname, [ AC_DEFINE(HAVE_GETHOSTBYNAME) ])
       fi
              "x$ac_cv_func_which_gethostbyname_r" = "xunknown" ; then
           AC_CHECK_FUNC(gethostbyname, [ AC_DEFINE(HAVE_GETHOSTBYNAME) ])
       fi

-      AC_SUBST(HAVE_FUNC_GETHOSTBYNAME_R_6)
-      AC_SUBST(HAVE_FUNC_GETHOSTBYNAME_R_5)
-      AC_SUBST(HAVE_FUNC_GETHOSTBYNAME_R_3)
-      AC_SUBST(HAVE_GETHOSTBYNAME)

       dnl A similar test for getservbyname_r
       dnl I'm tempted to just not do this test which is taking much time and
       dnl do something similar as for gethostbyaddr_r, but OTOH the macro
       dnl A similar test for getservbyname_r
       dnl I'm tempted to just not do this test which is taking much time and
       dnl do something similar as for gethostbyaddr_r, but OTOH the macro


@@ -5000,10 +4993,6 @@ AC_CHECK_FUNC(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO),
              "x$ac_cv_func_which_getservbyname_r" = "xunknown" ; then
           AC_CHECK_FUNCS(getservbyname,[ AC_DEFINE(HAVE_GETSERVBYNAME) ])
       fi
              "x$ac_cv_func_which_getservbyname_r" = "xunknown" ; then
           AC_CHECK_FUNCS(getservbyname,[ AC_DEFINE(HAVE_GETSERVBYNAME) ])
       fi

-      AC_SUBST(HAVE_FUNC_GETSERVBYNAME_R_6)
-      AC_SUBST(HAVE_FUNC_GETSERVBYNAME_R_5)
-      AC_SUBST(HAVE_FUNC_GETSERVBYNAME_R_4)
-      AC_SUBST(HAVE_GETSERVBYNAME)

       dnl For gethostbyaddr_r, we currently do no separate test, instead, we
       dnl silently assume it's available exactly if gethostbyname_r is
       dnl available and always requires two more arguments than
       dnl For gethostbyaddr_r, we currently do no separate test, instead, we
       dnl silently assume it's available exactly if gethostbyname_r is
       dnl available and always requires two more arguments than


@@ -5014,7 +5003,6 @@ AC_CHECK_FUNC(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO),
     ]
 )
 
     ]
 )
 

-

 if test "$wxUSE_THREADS" = "yes"; then
   AC_DEFINE(wxUSE_THREADS)
 
 if test "$wxUSE_THREADS" = "yes"; then
   AC_DEFINE(wxUSE_THREADS)
 

diff --git a/setup.h.in b/setup.h.in
index 6619e61c00260bb7c682cc10ea958d659faf5e1f..91e78e4a3c0ccae94b92232422ff6ca74d1118b8 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -865,6 +865,9 @@
 /* Define if you have BSD flock() function. */
 #undef HAVE_FLOCK
 
 /* Define if you have BSD flock() function. */
 #undef HAVE_FLOCK
 

+/* Define if you have getaddrinfo function. */
+#undef HAVE_GETADDRINFO
+

 /* Define if you have a gethostbyname_r function taking 6 arguments. */
 #undef HAVE_FUNC_GETHOSTBYNAME_R_6
 
 /* Define if you have a gethostbyname_r function taking 6 arguments. */
 #undef HAVE_FUNC_GETHOSTBYNAME_R_6