Commit 62eb0562 authored by Martti Mela's avatar Martti Mela

removed nested function calls from sac-general.m4 (compiles and works now on OSX, too)

darcs-hash:20060530093157-1b897-c6c38d20bd03c79206ee53146058455b8471a10b.gz
parent 8d4b707b
...@@ -176,8 +176,8 @@ AC_DEFUN([AC_SYS_SA_LEN], [ ...@@ -176,8 +176,8 @@ AC_DEFUN([AC_SYS_SA_LEN], [
AC_CACHE_CHECK([for sa_len], AC_CACHE_CHECK([for sa_len],
ac_cv_sa_len, ac_cv_sa_len,
[AC_TRY_COMPILE([#include <sys/types.h> [AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/socket.h>], [int main(void) { #include <sys/socket.h>], [
struct sockaddr t;t.sa_len = 0;}], struct sockaddr t;t.sa_len = 0;],
ac_cv_sa_len=yes,ac_cv_sa_len=no)]) ac_cv_sa_len=yes,ac_cv_sa_len=no)])
if test "$ac_cv_sa_len" = yes ;then if test "$ac_cv_sa_len" = yes ;then
AC_DEFINE([HAVE_SA_LEN], 1, AC_DEFINE([HAVE_SA_LEN], 1,
...@@ -195,9 +195,7 @@ AC_CACHE_CHECK([for MSG_NOSIGNAL], ...@@ -195,9 +195,7 @@ AC_CACHE_CHECK([for MSG_NOSIGNAL],
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>], [ #include <sys/socket.h>], [
int main() {
int flags = MSG_NOSIGNAL; int flags = MSG_NOSIGNAL;
}
], ac_cv_flag_msg_nosignal=yes, ac_cv_flag_msg_nosignal=no)]) ], ac_cv_flag_msg_nosignal=yes, ac_cv_flag_msg_nosignal=no)])
if test "$ac_cv_flag_msg_nosignal" = yes ; then if test "$ac_cv_flag_msg_nosignal" = yes ; then
AC_DEFINE([HAVE_MSG_NOSIGNAL], 1, AC_DEFINE([HAVE_MSG_NOSIGNAL], 1,
...@@ -215,9 +213,7 @@ AC_CACHE_CHECK([for MSG_ERRQUEUE], ...@@ -215,9 +213,7 @@ AC_CACHE_CHECK([for MSG_ERRQUEUE],
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>], [ #include <sys/socket.h>], [
int main() {
int flags = MSG_ERRQUEUE; int flags = MSG_ERRQUEUE;
}
], ac_cv_flag_msg_errqueue=yes, ac_cv_flag_msg_errqueue=no)]) ], ac_cv_flag_msg_errqueue=yes, ac_cv_flag_msg_errqueue=no)])
if test "$ac_cv_flag_msg_errqueue" = yes; then if test "$ac_cv_flag_msg_errqueue" = yes; then
AC_DEFINE([HAVE_MSG_ERRQUEUE], 1, AC_DEFINE([HAVE_MSG_ERRQUEUE], 1,
...@@ -357,9 +353,9 @@ AC_DEFUN([AC_C_MACRO_FUNCTION], ...@@ -357,9 +353,9 @@ AC_DEFUN([AC_C_MACRO_FUNCTION],
[AC_REQUIRE([AC_PROG_CC]) [AC_REQUIRE([AC_PROG_CC])
AC_CACHE_CHECK(whether $CC recognizes __FUNCTION__, ac_cv_c_macro_function, AC_CACHE_CHECK(whether $CC recognizes __FUNCTION__, ac_cv_c_macro_function,
AC_TRY_COMPILE(, AC_TRY_COMPILE(,
[int main() { [
char *s = __FUNCTION__; char *s = __FUNCTION__;
}], ac_cv_c_macro_function=yes, ac_cv_c_macro_function=no)) ], ac_cv_c_macro_function=yes, ac_cv_c_macro_function=no))
if test $ac_cv_c_macro_function = "yes"; then if test $ac_cv_c_macro_function = "yes"; then
AC_DEFINE([HAVE_FUNCTION], 1, [Define to 1 if the C compiler supports __FUNCTION__]) AC_DEFINE([HAVE_FUNCTION], 1, [Define to 1 if the C compiler supports __FUNCTION__])
fi fi
...@@ -382,10 +378,10 @@ AC_DEFUN([AC_C_KEYWORD_STRUCT], [ ...@@ -382,10 +378,10 @@ AC_DEFUN([AC_C_KEYWORD_STRUCT], [
AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_PROG_CC])
AC_CACHE_CHECK(whether $CC recognizes field names in struct initialization, ac_cv_c_keyword_struct, AC_CACHE_CHECK(whether $CC recognizes field names in struct initialization, ac_cv_c_keyword_struct,
AC_TRY_COMPILE(, AC_TRY_COMPILE(,
[int main() { [
struct { int foo; char *bar; } test = { foo: 1, bar: "bar" }; struct { int foo; char *bar; } test = { foo: 1, bar: "bar" };
return 0; return 0;
}], ],
ac_cv_c_keyword_struct=yes, ac_cv_c_keyword_struct=no)) ac_cv_c_keyword_struct=yes, ac_cv_c_keyword_struct=no))
if test $ac_cv_c_keyword_struct = "yes"; then if test $ac_cv_c_keyword_struct = "yes"; then
AC_DEFINE([HAVE_STRUCT_KEYWORDS], 1, [ AC_DEFINE([HAVE_STRUCT_KEYWORDS], 1, [
......
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