# HG changeset patch
# User diego
# Date 1186659341 0
# Node ID 1ac62a61ea56e873dba06c33421f702d802249dc
# Parent  4d576e0ed40b4487aff9dfa0eeb347fb36183308
Move some more compiler flags to configure.

diff -r 4d576e0ed40b -r 1ac62a61ea56 configure
--- a/configure	Thu Aug 09 10:26:00 2007 +0000
+++ b/configure	Thu Aug 09 11:35:41 2007 +0000
@@ -7371,6 +7371,11 @@
   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 @@
 
 /* libdvdcss */
 #define HAVE_ERRNO_H 1
+
+/* libdvdcss + libdvdread */
 #define HAVE_LIMITS_H 1
 
 /* libdvdcss + libfaad2 */
 #define HAVE_UNISTD_H 1
 
+/* libfaad2 + libdvdread */
+#define STDC_HEADERS 1
+
 /* libfaad2 */
-#define STDC_HEADERS 1
 #define HAVE_MEMCPY 1
 #define HAVE_STRCHR 1
 
diff -r 4d576e0ed40b -r 1ac62a61ea56 dvdread/Makefile
--- a/dvdread/Makefile	Thu Aug 09 10:26:00 2007 +0000
+++ b/dvdread/Makefile	Thu Aug 09 11:35:41 2007 +0000
@@ -11,7 +11,7 @@
               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
 
diff -r 4d576e0ed40b -r 1ac62a61ea56 libfaad2/common.h
--- a/libfaad2/common.h	Thu Aug 09 10:26:00 2007 +0000
+++ b/libfaad2/common.h	Thu Aug 09 11:35:41 2007 +0000
@@ -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))
diff -r 4d576e0ed40b -r 1ac62a61ea56 libfaad2/local_changes.diff
--- a/libfaad2/local_changes.diff	Thu Aug 09 10:26:00 2007 +0000
+++ b/libfaad2/local_changes.diff	Thu Aug 09 11:35:41 2007 +0000
@@ -33,19 +33,17 @@
  **/
  
  #ifndef __COMMON_H__
-@@ -32,10 +35,13 @@
- extern "C" {
+@@ -32,8 +35,13 @@
+ 
+ #ifdef HAVE_CONFIG_H
+ #  include "../config.h"
  #endif
- 
--#ifdef HAVE_CONFIG_H
--#  include "../config.h"
++
 +/* 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))