diff options
| author | Stephen Torri <storri@users.sourceforge.net> | 2004-07-24 02:35:47 +0000 |
|---|---|---|
| committer | Stephen Torri <storri@users.sourceforge.net> | 2004-07-24 02:35:47 +0000 |
| commit | aea7497f9b42806e89c1eb7659ab90b9b2b576df (patch) | |
| tree | 3269ac07cab98acef6e8ce93567a0ee71e19ffd9 | |
| parent | 1ee220dd9c3fbab61f3b5f44394a2e5a9b2d6188 (diff) | |
| download | xine-lib-aea7497f9b42806e89c1eb7659ab90b9b2b576df.tar.gz xine-lib-aea7497f9b42806e89c1eb7659ab90b9b2b576df.tar.bz2 | |
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
| -rw-r--r-- | m4/_xine.m4 | 21 |
1 files 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 <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 |