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

[handbrake-jp/handbrake-jp-git.git] / make / configure.py

diff --git a/make/configure.py b/make/configure.py
index 9580bfb..27c3801 100644 (file)
--- a/make/configure.py
+++ b/make/configure.py
@@ -630,7 +630,7 @@ class RepoProbe( ShellProbe ):
         if self.uuid == 'b64f7644-9d1e-0410-96f1-a4d463321fa5':
             self.official = 1
             m = re.match( '([^:]+)://([^/]+)/(.+)', self.url )
-            if m and re.match( 'tags/', m.group( 3 )):
+            if m and re.match( '.*tags/.*', m.group( 3 )):
                 self.type = 'release'
             else:
                 self.type = 'developer'
@@ -660,7 +660,7 @@ class Project( Action ):
 
         self.vmajor = 0
         self.vminor = 9
-        self.vpoint = 4
+        self.vpoint = 5
 
     def _action( self ):
         ## add architecture to URL only for Mac
@@ -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: