disable asserts in libdvdnav except when configured with --debug=max

dvdnav asserts on things are are almost never fatal.  so lets not
crash on them.

git-svn-id: svn://localhost/HandBrake/trunk@3159 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/libdvdnav/module.defs b/contrib/libdvdnav/module.defs
index 4134146..a8f3080 100644 (file)
--- a/contrib/libdvdnav/module.defs
+++ b/contrib/libdvdnav/module.defs
@@ -4,6 +4,10 @@ $(eval $(call import.CONTRIB.defs,LIBDVDNAV))
 LIBDVDNAV.FETCH.url = http://download.m0k.org/handbrake/contrib/libdvdnav-svn1168.tar.gz
 LIBDVDNAV.EXTRACT.tarbase = libdvdnav
 
+ifneq (max,$(GCC.g))
+       LIBDVDNAV.CONFIGURE.env.CFLAGS = CFLAGS="-DNDEBUG"
+endif
+
 LIBDVDNAV.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv;
 
 LIBDVDNAV.CONFIGURE.extra += --with-dvdread-config=$(call fn.ABSOLUTE,$(CONTRIB.build/)bin/dvdread-config)

diff --git a/make/configure.py b/make/configure.py
index 628a97a..27c3801 100644 (file)
--- a/make/configure.py
+++ b/make/configure.py
@@ -1302,6 +1302,10 @@ try:
         doc.add( 'XCODE.external.prefix', cfg.xcode_x_prefix )
 
     doc.addMake( '' )
+    doc.addMake( '## define debug mode before other includes' )
+    doc.addMake( '## since it is tested in some module.defs' )
+    doc.add( 'GCC.g', debugMode.mode )
+    doc.addBlank()
     doc.addMake( '## include definitions' )
     doc.addMake( 'include $(SRC/)make/include/main.defs' )
 
@@ -1324,7 +1328,6 @@ try:
         doc.add( 'GCC.minver', '' )
     doc.add( 'GCC.ldsysroot', '$(GCC.sysroot)' )
     doc.add( 'GCC.ldminver', '$(GCC.minver)' )
-    doc.add( 'GCC.g', debugMode.mode )
     doc.add( 'GCC.O', optimizeMode.mode )
 
     if options.enable_asm and not Tools.yasm.fail:

diff --git a/make/include/gcc.defs b/make/include/gcc.defs
index a9523dd..c9b82e7 100644 (file)
--- a/make/include/gcc.defs
+++ b/make/include/gcc.defs
@@ -14,7 +14,9 @@ GCC.minver  =
 GCC.ldminver=
 GCC.vis     = 0
 GCC.pic     = 0
-GCC.g       = none
+ifndef GCC.g
+       GCC.g       = none
+endif
 GCC.O       = none
 GCC.D       =
 GCC.I       =