[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] =?utf-8?q?HG=3A_xine-lib-1=2E2=3A_Finally_fix_compilat?= =?utf-8?q?ion_on_Fedora_16/17=2E
From:       Chris_Rankin <rankincj () yahoo ! com>
Date:       2012-07-29 19:25:43
Message-ID: 0208c8888ecf90ed288a.1343589934 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Chris Rankin <rankincj@yahoo.com>
# Date 1343589934 -3600
# Node ID 0208c8888ecf90ed288acd35c675d438c7d2e476
# Branch  default
# Parent  6a5338e869cc559ebf809a62d7a738914eda4b28
Finally fix compilation on Fedora 16/17.

diff --git a/m4/decoders.m4 b/m4/decoders.m4
--- a/m4/decoders.m4
+++ b/m4/decoders.m4
@@ -92,6 +92,7 @@
 
 	dnl Check presence of ffmpeg/avutil.h to see if it's old or new
 	dnl style for headers. The new style would be preferred actually...
+	ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $FFMPEG_CFLAGS"
 	AC_CHECK_HEADERS([ffmpeg/avutil.h])
 	AC_CHECK_HEADERS([libavutil/avutil.h])
 	AC_CHECK_HEADERS([libavutil/sha1.h])
@@ -99,6 +100,7 @@
 	if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test \
                "$ac_cv_header_libavutil_avutil_h" = "yes"; then
 	    AC_MSG_ERROR([old & new ffmpeg headers found - you need to clean up!])
 	fi
+        CFLAGS="$ac_save_CFLAGS"
 
     dnl gdk-pixbuf (optional; enabled by default)
     AC_ARG_ENABLE([gdkpixbuf],

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog


[prev in list] [next in list] [prev in thread] [next in thread]