From aea7497f9b42806e89c1eb7659ab90b9b2b576df Mon Sep 17 00:00:00 2001 From: Stephen Torri Date: Sat, 24 Jul 2004 02:35:47 +0000 Subject: When including AC_TRY_COMPILE in the ACTION-IF-NOT-FOUND section of another AC_TRY_COMPILE ensure that second call is wrapped in brackets ([ ACE_TRY_COMPILE ...]). Apparently without them autoheader and automake get confused. Replaced the AC_LANG_CPLUSPLUS, AC_LANG_SAVE and AC_LANG_RESTORE with the recommended calls of AC_LANG_PUSH(C++) and AC_LANG_POP([C++]). Let me know if the last two things cause problems. I can revert this change. CVS patchset: 6842 CVS date: 2004/07/24 02:35:47 --- m4/_xine.m4 | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/m4/_xine.m4 b/m4/_xine.m4 index d8e675a16..5fae550d8 100644 --- a/m4/_xine.m4 +++ b/m4/_xine.m4 @@ -375,30 +375,31 @@ _ACEOF dnl Check for the type of the third argument of getsockname AC_DEFUN([AC_CHECK_SOCKLEN_T], [ AC_MSG_CHECKING(for socklen_t) + AC_LANG_PUSH(C++) + AC_CACHE_VAL(ac_cv_socklen_t, [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([ + AC_TRY_COMPILE( #include #include - ],[ + , socklen_t a=0; getsockname(0,(struct sockaddr*)0, &a); - ], + , ac_cv_socklen_t=socklen_t, - AC_TRY_COMPILE([ + [ + AC_TRY_COMPILE( #include #include - ],[ + , int a=0; getsockname(0,(struct sockaddr*)0, &a); - ], + , ac_cv_socklen_t=int, ac_cv_socklen_t=size_t - ) + )] ) - AC_LANG_RESTORE ]) + AC_LANG_POP([C++]) AC_MSG_RESULT($ac_cv_socklen_t) if test "$ac_cv_socklen_t" != "socklen_t"; then -- cgit v1.2.3