summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@comstyle.com>2010-07-25 19:37:42 +0000
committerBrad Smith <brad@comstyle.com>2010-07-25 19:37:42 +0000
commit9bd0fa6ba63856698a88c95debb65f2a04ab93d9 (patch)
tree4976566a7acddbe34779fd2f2209edbf5f6bc8d3
parent070ab73cf3ac064f23895cb19b2e67717f42077d (diff)
downloadxine-lib-9bd0fa6ba63856698a88c95debb65f2a04ab93d9.tar.gz
xine-lib-9bd0fa6ba63856698a88c95debb65f2a04ab93d9.tar.bz2
Fix DVDNAV autoconf tests
The DVDNAV autoconf test is broken due to a missing header. DVDNAV's dvdnav.h header due to the inclusion of dvdread/ifo_types.h requires stdint.h be included before dvdnav.h.
-rw-r--r--m4/dvdnav.m47
1 files changed, 6 insertions, 1 deletions
diff --git a/m4/dvdnav.m4 b/m4/dvdnav.m4
index a7f354b63..d82fc02db 100644
--- a/m4/dvdnav.m4
+++ b/m4/dvdnav.m4
@@ -84,6 +84,7 @@ dnl checks the results of dvdnav-config to some extent
dnl
rm -f conf.dvdnavtest
AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include <stdint.h>
#include <dvdnav/dvdnav.h>
#include <stdio.h>
#include <stdlib.h>
@@ -129,6 +130,7 @@ main ()
]])],[],[no_dvdnav=yes],[no_dvdnav=cc])
if test "x$no_dvdnav" = xcc; then
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <stdint.h>
#include <dvdnav/dvdnav.h>
#include <stdio.h>
]], [[ return 0; ]])],[no_dvdnav=''],[no_dvdnav=yes])
@@ -141,7 +143,9 @@ main ()
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
dnl nav_*.h seem to have been moved from dvdnav at some point?
- AC_CHECK_HEADERS([dvdread/nav_types.h])
+ AC_CHECK_HEADERS([dvdread/nav_types.h],,,
+[#include <stdint.h>
+])
else
AC_MSG_RESULT(no)
if test "$DVDNAV_CONFIG" = "no" ; then
@@ -157,6 +161,7 @@ main ()
CFLAGS="$CFLAGS $DVDNAV_CFLAGS"
LIBS="$LIBS $DVDNAV_LIBS"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <stdint.h>
#include <dvdnav/dvdnav.h>
#include <stdio.h>
]], [[ return 0; ]])],