[MPlayer-cvslog] r24043 - in trunk: configure dvdread/Makefile libfaad2/common.h libfaad2/local_changes.diff

[diego]

Author: diego
Date: Thu Aug  9 13:35:41 2007
New Revision: 24043

Log:
Move some more compiler flags to configure.


Modified:
   trunk/configure
   trunk/dvdread/Makefile
   trunk/libfaad2/common.h
   trunk/libfaad2/local_changes.diff

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Aug  9 13:35:41 2007
@@ -7371,6 +7371,11 @@ if test "$_largefiles" = yes || freebsd 
   fi
 fi
 
+# Make sure config.h gets included.
+if test "$_dvdread_internal" = yes || test "$_faad_internal" = yes ; then
+  CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+fi
+
 CFLAGS="-I. -I.. -I../libavutil $CFLAGS"
 CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS"
 
@@ -7682,13 +7687,17 @@ $_def_fast_inttypes
 
 /* libdvdcss */
 #define HAVE_ERRNO_H 1
+
+/* libdvdcss + libdvdread */
 #define HAVE_LIMITS_H 1
 
 /* libdvdcss + libfaad2 */
 #define HAVE_UNISTD_H 1
 
-/* libfaad2 */
+/* libfaad2 + libdvdread */
 #define STDC_HEADERS 1
+
+/* libfaad2 */
 #define HAVE_MEMCPY 1
 #define HAVE_STRCHR 1
 

Modified: trunk/dvdread/Makefile
==============================================================================
--- trunk/dvdread/Makefile	(original)
+++ trunk/dvdread/Makefile	Thu Aug  9 13:35:41 2007
@@ -11,7 +11,7 @@ SRCS_COMMON = dvd_input.c \
               nav_read.c \
               md5.c \
 
-CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE -DSTDC_HEADERS -DHAVE_LIMITS_H
+CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE
 
 CFLAGS-$(DVDCSS_INTERNAL) += -I../libdvdcss -DHAVE_DVDCSS_DVDCSS_H
 

Modified: trunk/libfaad2/common.h
==============================================================================
--- trunk/libfaad2/common.h	(original)
+++ trunk/libfaad2/common.h	Thu Aug  9 13:35:41 2007
@@ -35,13 +35,15 @@
 extern "C" {
 #endif
 
+#ifdef HAVE_CONFIG_H
+#  include "../config.h"
+#endif
+
 /* Allow build on Cygwin*/
 #if defined(__CYGWIN__)
 #define __STRICT_ANSI__
 #endif
 
-#include "../config.h"
-
 #define INLINE __inline
 #if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
 #define ALIGN __declspec(align(16))

Modified: trunk/libfaad2/local_changes.diff
==============================================================================
--- trunk/libfaad2/local_changes.diff	(original)
+++ trunk/libfaad2/local_changes.diff	Thu Aug  9 13:35:41 2007
@@ -33,19 +33,17 @@
  **/
  
  #ifndef __COMMON_H__
-@@ -32,10 +35,13 @@
- extern "C" {
- #endif
+@@ -32,8 +35,13 @@
  
--#ifdef HAVE_CONFIG_H
--#  include "../config.h"
+ #ifdef HAVE_CONFIG_H
+ #  include "../config.h"
+ #endif
++
 +/* Allow build on Cygwin*/
 +#if defined(__CYGWIN__)
 +#define __STRICT_ANSI__
- #endif
++#endif
  
-+#include "../config.h"
-+
  #define INLINE __inline
  #if 0 //defined(_WIN32) && !defined(_WIN32_WCE)
  #define ALIGN __declspec(align(16))