From a0c531cad84b9bb9d20c2ad21c18a118988b0e96 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Wed, 7 Mar 2012 17:17:06 +0000 Subject: [PATCH] Ecore: fix detection of net/if.h and shm_open on Mac OS X SVN revision: 69010 --- legacy/ecore/configure.ac | 56 +++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac index ebab500488..f4a5806344 100644 --- a/legacy/ecore/configure.ac +++ b/legacy/ecore/configure.ac @@ -1228,7 +1228,23 @@ esac # ecore_con -AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h netinet/tcp.h net/if.h netinet/in.h sys/socket.h sys/un.h ws2tcpip.h netdb.h]) +AC_CHECK_HEADERS([sys/socket.h]) +AC_CHECK_HEADERS([net/if.h], [], [], +[ +#include +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_SYS_SOCKET_H +# include +#endif +]) +AC_CHECK_HEADERS([sys/un.h arpa/inet.h arpa/nameser.h netinet/tcp.h netinet/in.h ws2tcpip.h netdb.h]) if test "x${ac_cv_header_netdb_h}" = "xyes" ; then have_addrinfo="yes" @@ -1419,7 +1435,9 @@ if ! test "x${have_atfile_source}" = "xno" ; then fi SHM_OPEN_LIBS="" -AC_COMPILE_IFELSE( + +AC_MSG_CHECKING([whether shm_open is in libc]) +AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[ #include @@ -1434,12 +1452,40 @@ shm_unlink("/"); [ have_shm_open="yes" AC_DEFINE(HAVE_SHM_OPEN, 1, [Have shm_open() call]) - SHM_OPEN_LIBS="-lrt" ], [have_shm_open="no"]) -AC_SUBST(SHM_OPEN_LIBS) +LIBS="${LIBS_save}" +AC_MSG_RESULT([${have_shm_open}]) -AC_MSG_CHECKING([shm_open]) +if ! test "x${have_shm_open}" = "xyes" ; then + AC_MSG_CHECKING([whether shm_open is in librt]) + LIBS_save="${LIBS}" + LIBS="${LIBS} -lrt" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include +#include + ]], + [[ +int fd; +fd = shm_open("/", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); +shm_unlink("/"); + ]])], + [ + have_shm_open="yes" + AC_DEFINE(HAVE_SHM_OPEN, 1, [Have shm_open() call]) + SHM_OPEN_LIBS="-lrt" + ], + [have_shm_open="no"]) + LIBS="${LIBS_save}" + AC_MSG_RESULT([${have_shm_open}]) +fi + +AC_SUBST([SHM_OPEN_LIBS]) + +AC_MSG_CHECKING([whether shm_open is available]) AC_MSG_RESULT([${have_shm_open}]) ### Checks for optionnal feature