projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #1520 from madrang/SafeHandleFix
[mono.git] / configure.ac
diff --git a/configure.ac b/configure.ac
index 50eaa44960f52dd26e9e169d984799715d29033a..7b9f3fabe10508c3e852ce213b10ab8c826d64d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -306,7 +306,6 @@ case "$host" in
                platform_darwin=yes
                target_mach=yes
                CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
-               CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent"
                libmono_cflags="-D_THREAD_SAFE"
                need_link_unlink=yes
                AC_DEFINE(PTHREAD_POINTER_ID)
@@ -441,8 +440,8 @@ AM_ICONV()
 
 AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
 
-AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h sys/param.h libproc.h)
-AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h)
+AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h sys/param.h sys/sysctl.h libproc.h)
+AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h arpa/inet.h)
 AC_CHECK_HEADERS([linux/netlink.h linux/rtnetlink.h],
                   [], [], [#include <stddef.h>
                  #include <sys/socket.h>
@@ -1519,11 +1518,32 @@ if test x$target_win32 = xno; then
                ])
        ])
        
+       dnl **********************************
+       dnl *** Check for getaddrinfo ***
+       dnl **********************************
+       AC_MSG_CHECKING(for getaddrinfo)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <netdb.h>
+       ], [
+               getaddrinfo(NULL,NULL,NULL,NULL);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GETADDRINFO, 1, [Have getaddrinfo])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
        dnl **********************************
        dnl *** Check for gethostbyname2_r ***
        dnl **********************************
        AC_MSG_CHECKING(for gethostbyname2_r)
-               AC_TRY_LINK([#include <netdb.h>], [
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <netdb.h>
+       ], [
+
                gethostbyname2_r(NULL,0,NULL,NULL,0,NULL,NULL);
        ], [
                # Yes, we have it...
@@ -1533,6 +1553,92 @@ if test x$target_win32 = xno; then
                AC_MSG_RESULT(no)
        ])
 
+       dnl **********************************
+       dnl *** Check for gethostbyname2 ***
+       dnl **********************************
+       AC_MSG_CHECKING(for gethostbyname2)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <netdb.h>
+       ], [
+               gethostbyname2(NULL,0);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GETHOSTBYNAME2, 1, [Have gethostbyname2])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl **********************************
+       dnl *** Check for gethostbyname ***
+       dnl **********************************
+       AC_MSG_CHECKING(for gethostbyname)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <netdb.h>
+       ], [
+               gethostbyname(NULL);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GETHOSTBYNAME, 1, [Have gethostbyname])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl **********************************
+       dnl *** Check for getprotobyname ***
+       dnl **********************************
+       AC_MSG_CHECKING(for getprotobyname)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <netdb.h>
+       ], [
+               getprotobyname(NULL);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GETPROTOBYNAME, 1, [Have getprotobyname])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl **********************************
+       dnl *** Check for getnameinfo ***
+       dnl **********************************
+       AC_MSG_CHECKING(for getnameinfo)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <netdb.h>
+       ], [
+               getnameinfo (NULL, 0, NULL, 0, NULL, 0, 0);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GETNAMEINFO, 1, [Have getnameinfo])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+
+       dnl **********************************
+       dnl *** Check for inet_ntop ***
+       dnl **********************************
+       AC_MSG_CHECKING(for inet_ntop)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <arpa/inet.h>
+       ], [
+               inet_ntop (0, NULL, NULL, 0);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_INET_NTOP, 1, [Have inet_ntop])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
        dnl *****************************
        dnl *** Checks for libnsl     ***
        dnl *****************************
@@ -2156,6 +2262,97 @@ else
                        AC_MSG_RESULT(no)
                ])
        ])
+
+       dnl **********************************
+       dnl *** Check for getaddrinfo ***
+       dnl **********************************
+       AC_MSG_CHECKING(for getaddrinfo)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <winsock2.h>
+               #include <ws2tcpip.h>
+       ], [
+               getaddrinfo(NULL,NULL,NULL,NULL);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GETADDRINFO, 1, [Have getaddrinfo])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl **********************************
+       dnl *** Check for gethostbyname ***
+       dnl **********************************
+       AC_MSG_CHECKING(for gethostbyname)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <winsock2.h>
+               #include <ws2tcpip.h>
+       ], [
+               gethostbyname(NULL);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GETHOSTBYNAME, 1, [Have gethostbyname])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl **********************************
+       dnl *** Check for getprotobyname ***
+       dnl **********************************
+       AC_MSG_CHECKING(for getprotobyname)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <winsock2.h>
+               #include <ws2tcpip.h>
+       ], [
+               getprotobyname(NULL);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GETPROTOBYNAME, 1, [Have getprotobyname])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl **********************************
+       dnl *** Check for getnameinfo ***
+       dnl **********************************
+       AC_MSG_CHECKING(for getnameinfo)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <winsock2.h>
+               #include <ws2tcpip.h>
+       ], [
+               getnameinfo (NULL, 0, NULL, 0, NULL, 0, 0);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GETNAMEINFO, 1, [Have getnameinfo])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl **********************************
+       dnl *** Check for inet_ntop ***
+       dnl **********************************
+       AC_MSG_CHECKING(for inet_ntop)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <winsock2.h>
+               #include <ws2tcpip.h>
+       ], [
+               inet_ntop (0, NULL, NULL, 0);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_INET_NTOP, 1, [Have inet_ntop])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
        AC_CHECK_DECLS(InterlockedExchange64, [], [], [[#include <windows.h>]])
        AC_CHECK_DECLS(InterlockedCompareExchange64, [], [], [[#include <windows.h>]])
        AC_CHECK_DECLS(InterlockedDecrement64, [], [], [[#include <windows.h>]])
@@ -3622,7 +3819,6 @@ mono/tests/cas/threads/Makefile
 mono/tests/gc-descriptors/Makefile
 mono/unit-tests/Makefile
 mono/benchmark/Makefile
-mono/monograph/Makefile
 mono/io-layer/Makefile
 mono/mini/Makefile
 mono/profiler/Makefile
@@ -3664,6 +3860,7 @@ data/config
 tools/Makefile
 tools/locale-builder/Makefile
 tools/sgen/Makefile
+tools/monograph/Makefile
 runtime/Makefile
 msvc/Makefile
 po/Makefile
my mono mirror. check out Moved to http://github.com/mono/mono