Skip to content

L
libzmq
Commit e05c8056 authored by Pieter Hintjens's avatar Pieter Hintjens
Browse files
Options

Merge pull request #1342 from chickenkiller/master 

acinclude.m4: make kernel-specific flags cacheable
parents 8e89d116 9daf6dd7
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 30 deletions
acinclude.m4
View file @ e05c8056
...@@ -586,8 +586,8 @@ dnl # LIBZMQ_CHECK_SOCK_CLOEXEC([action-if-found], [action-if-not-found]) ...@@ -586,8 +586,8 @@ dnl # LIBZMQ_CHECK_SOCK_CLOEXEC([action-if-found], [action-if-not-found])
dnl # Check if SOCK_CLOEXEC is supported # dnl # Check if SOCK_CLOEXEC is supported #
dnl ################################################################################ dnl ################################################################################
AC_DEFUN([LIBZMQ_CHECK_SOCK_CLOEXEC], [{ AC_DEFUN([LIBZMQ_CHECK_SOCK_CLOEXEC], [{
AC_MSG_CHECKING(whether SOCK_CLOEXEC is supported) AC_CACHE_CHECK([whether SOCK_CLOEXEC is supported], [libzmq_cv_sock_cloexec],
AC_TRY_RUN([/* SOCK_CLOEXEC test */ [AC_TRY_RUN([/* SOCK_CLOEXEC test */
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
...@@ -597,10 +597,12 @@ int main (int argc, char *argv []) ...@@ -597,10 +597,12 @@ int main (int argc, char *argv [])
return (s == -1); return (s == -1);
} }
], ],
[AC_MSG_RESULT(yes) ; libzmq_cv_sock_cloexec="yes" ; $1], [libzmq_cv_sock_cloexec="yes"],
[AC_MSG_RESULT(no) ; libzmq_cv_sock_cloexec="no" ; $2], [libzmq_cv_sock_cloexec="no"],
[AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_sock_cloexec="no"] [libzmq_cv_sock_cloexec="not during cross-compile"]
)]
) )
AS_IF([test "x$libzmq_cv_sock_cloexec" = "xyes"], [$1], [$2])
}]) }])
dnl ################################################################################ dnl ################################################################################
...@@ -628,8 +630,8 @@ dnl # LIBZMQ_CHECK_SO_KEEPALIVE([action-if-found], [action-if-not-found]) ...@@ -628,8 +630,8 @@ dnl # LIBZMQ_CHECK_SO_KEEPALIVE([action-if-found], [action-if-not-found])
dnl # Check if SO_KEEPALIVE is supported # dnl # Check if SO_KEEPALIVE is supported #
dnl ################################################################################ dnl ################################################################################
AC_DEFUN([LIBZMQ_CHECK_SO_KEEPALIVE], [{ AC_DEFUN([LIBZMQ_CHECK_SO_KEEPALIVE], [{
AC_MSG_CHECKING(whether SO_KEEPALIVE is supported) AC_CACHE_CHECK([whether SO_KEEPALIVE is supported], [libzmq_cv_so_keepalive],
AC_TRY_RUN([/* SO_KEEPALIVE test */ [AC_TRY_RUN([/* SO_KEEPALIVE test */
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
...@@ -642,10 +644,12 @@ int main (int argc, char *argv []) ...@@ -642,10 +644,12 @@ int main (int argc, char *argv [])
); );
} }
], ],
[AC_MSG_RESULT(yes) ; libzmq_cv_so_keepalive="yes" ; $1], [libzmq_cv_so_keepalive="yes"],
[AC_MSG_RESULT(no) ; libzmq_cv_so_keepalive="no" ; $2], [libzmq_cv_so_keepalive="no"],
[AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_so_keepalive="no"] [libzmq_cv_so_keepalive="not during cross-compile"]
)]
) )
AS_IF([test "x$libzmq_cv_so_keepalive" = "xyes"], [$1], [$2])
}]) }])
dnl ################################################################################ dnl ################################################################################
...@@ -653,8 +657,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPCNT([action-if-found], [action-if-not-found]) ...@@ -653,8 +657,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPCNT([action-if-found], [action-if-not-found])
dnl # Check if TCP_KEEPCNT is supported # dnl # Check if TCP_KEEPCNT is supported #
dnl ################################################################################ dnl ################################################################################
AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPCNT], [{ AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPCNT], [{
AC_MSG_CHECKING(whether TCP_KEEPCNT is supported) AC_CACHE_CHECK([whether TCP_KEEPCNT is supported], [libzmq_cv_tcp_keepcnt],
AC_TRY_RUN([/* TCP_KEEPCNT test */ [AC_TRY_RUN([/* TCP_KEEPCNT test */
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
...@@ -670,10 +674,12 @@ int main (int argc, char *argv []) ...@@ -670,10 +674,12 @@ int main (int argc, char *argv [])
); );
} }
], ],
[AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepcnt="yes" ; $1], [libzmq_cv_tcp_keepcnt="yes"],
[AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepcnt="no" ; $2], [libzmq_cv_tcp_keepcnt="no"],
[AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepcnt="no"] [libzmq_cv_tcp_keepcnt="not during cross-compile"]
)]
) )
AS_IF([test "x$libzmq_cv_tcp_keepcnt" = "xyes"], [$1], [$2])
}]) }])
dnl ################################################################################ dnl ################################################################################
...@@ -681,8 +687,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPIDLE([action-if-found], [action-if-not-found]) ...@@ -681,8 +687,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPIDLE([action-if-found], [action-if-not-found])
dnl # Check if TCP_KEEPIDLE is supported # dnl # Check if TCP_KEEPIDLE is supported #
dnl ################################################################################ dnl ################################################################################
AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPIDLE], [{ AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPIDLE], [{
AC_MSG_CHECKING(whether TCP_KEEPIDLE is supported) AC_CACHE_CHECK([whether TCP_KEEPIDLE is supported], [libzmq_cv_tcp_keepidle],
AC_TRY_RUN([/* TCP_KEEPIDLE test */ [AC_TRY_RUN([/* TCP_KEEPIDLE test */
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
...@@ -698,10 +704,12 @@ int main (int argc, char *argv []) ...@@ -698,10 +704,12 @@ int main (int argc, char *argv [])
); );
} }
], ],
[AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepidle="yes" ; $1], [libzmq_cv_tcp_keepidle="yes"],
[AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepidle="no" ; $2], [libzmq_cv_tcp_keepidle="no"],
[AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepidle="no"] [libzmq_cv_tcp_keepidle="not during cross-compile"]
)]
) )
AS_IF([test "x$libzmq_cv_tcp_keepidle" = "xyes"], [$1], [$2])
}]) }])
dnl ################################################################################ dnl ################################################################################
...@@ -709,8 +717,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPINTVL([action-if-found], [action-if-not-found]) ...@@ -709,8 +717,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPINTVL([action-if-found], [action-if-not-found])
dnl # Check if TCP_KEEPINTVL is supported # dnl # Check if TCP_KEEPINTVL is supported #
dnl ################################################################################ dnl ################################################################################
AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPINTVL], [{ AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPINTVL], [{
AC_MSG_CHECKING(whether TCP_KEEPINTVL is supported) AC_CACHE_CHECK([whether TCP_KEEPINTVL is supported], [libzmq_cv_tcp_keepintvl],
AC_TRY_RUN([/* TCP_KEEPINTVL test */ [AC_TRY_RUN([/* TCP_KEEPINTVL test */
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
...@@ -726,10 +734,12 @@ int main (int argc, char *argv []) ...@@ -726,10 +734,12 @@ int main (int argc, char *argv [])
); );
} }
], ],
[AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepintvl="yes" ; $1], [libzmq_cv_tcp_keepintvl="yes"],
[AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepintvl="no" ; $2], [libzmq_cv_tcp_keepintvl="no"],
[AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepintvl="no"] [libzmq_cv_tcp_keepintvl="not during cross-compile"]
)]
) )
AS_IF([test "x$libzmq_cv_tcp_keepintvl" = "xyes"], [$1], [$2])
}]) }])
dnl ################################################################################ dnl ################################################################################
...@@ -737,8 +747,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPALIVE([action-if-found], [action-if-not-found]) ...@@ -737,8 +747,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPALIVE([action-if-found], [action-if-not-found])
dnl # Check if TCP_KEEPALIVE is supported # dnl # Check if TCP_KEEPALIVE is supported #
dnl ################################################################################ dnl ################################################################################
AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPALIVE], [{ AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPALIVE], [{
AC_MSG_CHECKING(whether TCP_KEEPALIVE is supported) AC_CACHE_CHECK([whether TCP_KEEPALIVE is supported], [libzmq_cv_tcp_keepalive],
AC_TRY_RUN([/* TCP_KEEPALIVE test */ [AC_TRY_RUN([/* TCP_KEEPALIVE test */
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
...@@ -754,10 +764,12 @@ int main (int argc, char *argv []) ...@@ -754,10 +764,12 @@ int main (int argc, char *argv [])
); );
} }
], ],
[AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepalive="yes" ; $1], [libzmq_cv_tcp_keepalive="yes"],
[AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepalive="no" ; $2], [libzmq_cv_tcp_keepalive="no"],
[AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepalive="no"] [libzmq_cv_tcp_keepalive="not during cross-compile"]
)]
) )
AS_IF([test "x$libzmq_cv_tcp_keepalive" = "xyes"], [$1], [$2])
}]) }])
dnl ################################################################################ dnl ################################################################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment