Another attempt at FLAC workaround.

git-svn-id: svn://localhost/ardour2/branches/3.0@4684 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/wscript b/wscript
index 899fb6a68a3accc2757813dfca8b174a51c4bdbf..b5ef9fabda58f714ad27ce4aa31561d4232110db 100644 (file)
--- a/wscript
+++ b/wscript
@@ -127,19 +127,8 @@ def configure(conf):
        for i in children:
                sub_config_and_use(conf, i)
        
-       print conf.env['CCFLAGS']
-       print conf.env['CXXFLAGS']
-
-       # Fix utterly braindead FLAC include path
-       for prefix in [ '/usr/include', '/usr/local/include' ]:
-               for flags in [ conf.env['CCFLAGS'], conf.env['CXXFLAGS'] ]:
-                       for i in flags:
-                               if i == '-I' + prefix + '/FLAC':
-                                       print '*** STRIPPED IDIOTIC FLAC INCLUDE PATH'
-                                       flags.remove(i)
-
-       print conf.env['CCFLAGS']
-       print conf.env['CXXFLAGS']
+       # Fix utterly braindead FLAC include path to not smash assert.h
+       conf.env['CPPPATH_FLAC'] = []
 
        autowaf.print_summary(conf)
        opts = Options.options