[MPlayer-cvslog] r26619 - in trunk: Makefile configure

[diego]

Author: diego
Date: Wed Apr 30 17:36:17 2008
New Revision: 26619

Log:
Set libdvdcss CFLAGS for dvdread from configure.


Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Apr 30 17:36:17 2008
@@ -771,10 +771,7 @@ codec-cfg-test$(EXESUF): codecs.conf.h c
 osdep/mplayer-rc.o: osdep/mplayer.rc version.h
 	$(WINDRES) -o $@ $<
 
-dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE
-ifeq ($(LIBDVDCSS_INTERNAL),yes)
-dvdread/%.o dvdread/%.d: CFLAGS += -Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H
-endif
+dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDREAD_FLAGS)
 libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\"
 libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE
 

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Wed Apr 30 17:36:17 2008
@@ -5490,6 +5490,7 @@ if test "$_libdvdcss_internal" = yes ; t
     _def_dvd_darwin='#define DARWIN_DVD_IOCTL'
     _ld_extra="$_ld_extra -framework IOKit"
   fi
+  _libdvdcss_dvdread_flags="-Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H"
   _inputmodules="libdvdcss(internal) $_inputmodules"
   _largefiles=yes
 else
@@ -7788,6 +7789,7 @@ VCD = $_vcd
 DVDREAD = $_dvdread
 DVDREAD_INTERNAL = $_dvdread_internal
 LIBDVDCSS_INTERNAL = $_libdvdcss_internal
+LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags
 DVDNAV = $_dvdnav
 WIN32DLL = $_win32dll
 WIN32_EMULATION = $_win32_emulation