From: Stephen T. <st...@us...> - 2004-07-24 02:35:55
|
Update of /cvsroot/xine/xine-lib/m4 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9892/m4 Modified Files: _xine.m4 Log Message: 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. Index: _xine.m4 =================================================================== RCS file: /cvsroot/xine/xine-lib/m4/_xine.m4,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- _xine.m4 23 Jul 2004 12:42:15 -0000 1.35 +++ _xine.m4 24 Jul 2004 02:35:47 -0000 1.36 @@ -375,30 +375,31 @@ 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 <sys/types.h> #include <sys/socket.h> - ],[ + , socklen_t a=0; getsockname(0,(struct sockaddr*)0, &a); - ], + , ac_cv_socklen_t=socklen_t, - AC_TRY_COMPILE([ + [ + AC_TRY_COMPILE( #include <sys/types.h> #include <sys/socket.h> - ],[ + , 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 |