Rob Shearman : configure.ac: Fix test for libresolv on Mac OS 10.4.x.
Alexandre Julliard
julliard at winehq.org
Fri Jan 2 08:25:51 CST 2009
Module: wine
Branch: master
Commit: ba349210345accf4026c8db65d9fe9ed0341cee1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba349210345accf4026c8db65d9fe9ed0341cee1
Author: Rob Shearman <robertshearman at gmail.com>
Date: Fri Jan 2 12:12:06 2009 +0000
configure.ac: Fix test for libresolv on Mac OS 10.4.x.
The resolv.h header file won't compile without netinet/in.h being
included first.
---
configure | 3 +++
configure.ac | 5 ++++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 98115be..6fd413f 100755
--- a/configure
+++ b/configure
@@ -14285,6 +14285,9 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
#include <resolv.h>
int
main ()
diff --git a/configure.ac b/configure.ac
index 784107e..8d45409 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1011,7 +1011,10 @@ if test "$ac_cv_header_resolv_h" = "yes"
then
ac_save_LIBS="$LIBS"
LIBS="$LIBS -lresolv"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <resolv.h>]],[[res_init();]])],
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#include <resolv.h>]],[[res_init();]])],
[AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header])
RESOLVLIBS="-lresolv"])
LIBS="$ac_save_LIBS"
More information about the wine-cvs
mailing list