From 5b468252036fdbadfab00df743c35a415fbb2adb Mon Sep 17 00:00:00 2001 From: Gabriele Svelto Date: Thu, 26 Apr 2012 09:17:23 +0200 Subject: Replaced obsolete autoconf and automake macros This patch cleans up a number of obsolete constructs in the build system, these include: - Replacing AC_TRY_RUN with AC_RUN_IFELSE for the SOCK_CLOEXEC test - Using AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER - Using LT_INIT with the win32-dll parameter instead of the obsolete AC_PROG_LIBTOOL and AC_LIBTOOL_WIN32_DLL macros - Removing the unused and obsolete AC_TYPE_SIGNAL check - Removing the unused alloca.h header check - Replacing the deprecated INCLUDES macro with AM_CPPFLAGS Signed-off-by: Gabriele Svelto --- acinclude.m4 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'acinclude.m4') diff --git a/acinclude.m4 b/acinclude.m4 index e1429e5..51a3d5c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -581,13 +581,15 @@ AC_DEFUN([LIBXS_CHECK_LANG_VISIBILITY], [{ [AC_MSG_RESULT(yes) ; $1], [AC_MSG_RESULT(no) ; $2]) }]) -dnl ################################################################################ -dnl # LIBXS_CHECK_SOCK_CLOEXEC([action-if-found], [action-if-not-found]) # -dnl # Check if SOCK_CLOEXEC is supported # -dnl ################################################################################ -AC_DEFUN([LIBXS_CHECK_SOCK_CLOEXEC], [{ - AC_MSG_CHECKING(whether SOCK_CLOEXEC is supported) - AC_TRY_RUN([/* SOCK_CLOEXEC test */ +############################################################################### +# LIBXS_CHECK_SOCK_CLOEXEC([action-if-found], [action-if-not-found]) # +# Check if SOCK_CLOEXEC is supported # +############################################################################### + +AC_DEFUN([LIBXS_CHECK_SOCK_CLOEXEC], [ + AC_MSG_CHECKING([whether SOCK_CLOEXEC is supported]) + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +/* SOCK_CLOEXEC test */ #include #include @@ -595,13 +597,11 @@ int main (int argc, char *argv []) { int s = socket (PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0); return (s == -1); -} - ], +} ]])], [AC_MSG_RESULT(yes) ; libxs_cv_sock_cloexec="yes" ; $1], [AC_MSG_RESULT(no) ; libxs_cv_sock_cloexec="no" ; $2], - [AC_MSG_RESULT(not during cross-compile) ; libxs_cv_sock_cloexec="no"] - ) -}]) + [AC_MSG_RESULT(not during cross-compile) ; libxs_cv_sock_cloexec="no"]) +]) ############################################################################### # LIBXS_CHECK_KQUEUE # -- cgit v1.2.3