1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/lib/recipetool/create_buildsys.py b/scripts/lib/recipetool/create_buildsys.py
index 0228269cf9..909743b384 100644
--- a/scripts/lib/recipetool/create_buildsys.py
+++ b/scripts/lib/recipetool/create_buildsys.py
@@ -413,15 +413,15 @@ class AutotoolsRecipeHandler(RecipeHandler):
        progclassmap = {'gconftool-2': 'gconf',
                'pkg-config': 'pkgconfig'}
-        pkg_re = re.compile('PKG_CHECK_MODULES\(\[?[a-zA-Z0-9_]*\]?, *\[?([^,\]]*)\]?[),].*')
+        pkg_re = re.compile('PKG_CHECK_MODULES\(\s*\[?[a-zA-Z0-9_]*\]?,\s*\[?([^,\]]*)\]?[),].*')
-        pkgce_re = re.compile('PKG_CHECK_EXISTS\(\[?([^,\]]*)\]?[),].*')
+        pkgce_re = re.compile('PKG_CHECK_EXISTS\(\s*\[?([^,\]]*)\]?[),].*')
-        lib_re = re.compile('AC_CHECK_LIB\(\[?([^,\]]*)\]?,.*')
+        lib_re = re.compile('AC_CHECK_LIB\(\s*\[?([^,\]]*)\]?,.*')
-        libx_re = re.compile('AX_CHECK_LIBRARY\(\[?[^,\]]*\]?, *\[?([^,\]]*)\]?, *\[?([a-zA-Z0-9-]*)\]?,.*')
+        libx_re = re.compile('AX_CHECK_LIBRARY\(\s*\[?[^,\]]*\]?,\s*\[?([^,\]]*)\]?,\s*\[?([a-zA-Z0-9-]*)\]?,.*')
-        progs_re = re.compile('_PROGS?\(\[?[a-zA-Z0-9_]*\]?, \[?([^,\]]*)\]?[),].*')
+        progs_re = re.compile('_PROGS?\(\s*\[?[a-zA-Z0-9_]*\]?,\s*\[?([^,\]]*)\]?[),].*')
        dep_re = re.compile('([^ ><=]+)( [<>=]+ [^ ><=]+)?')
-        ac_init_re = re.compile('AC_INIT\(([^,]+), *([^,]+)[,)].*')
+        ac_init_re = re.compile('AC_INIT\(\s*([^,]+),\s*([^,]+)[,)].*')
-        am_init_re = re.compile('AM_INIT_AUTOMAKE\(([^,]+), *([^,]+)[,)].*')
+        am_init_re = re.compile('AM_INIT_AUTOMAKE\(\s*([^,]+),\s*([^,]+)[,)].*')
-        define_re = re.compile(' *(m4_)?define\(([^,]+), *([^,]+)\)')
+        define_re = re.compile('\s*(m4_)?define\(\s*([^,]+),\s*([^,]+)\)')
        defines = {}
        def subst_defines(value):

diff --git a/scripts/lib/recipetool/create_buildsys.py b/scripts/lib/recipetool/create_buildsys.py index 0228269cf9..909743b384 100644 --- a/scripts/lib/recipetool/create_buildsys.py +++ b/scripts/lib/recipetool/create_buildsys.py
@@ -413,15 +413,15 @@ class AutotoolsRecipeHandler(RecipeHandler):
413	progclassmap = {'gconftool-2': 'gconf',	413	progclassmap = {'gconftool-2': 'gconf',
414	'pkg-config': 'pkgconfig'}	414	'pkg-config': 'pkgconfig'}
415		415
416	pkg_re = re.compile('PKG_CHECK_MODULES\(\[?[a-zA-Z0-9_]\]?, \[?([^,\]])\]?[),].')	416	pkg_re = re.compile('PKG_CHECK_MODULES\(\s\[?[a-zA-Z0-9_]\]?,\s\[?([^,\]])\]?[),].*')
417	pkgce_re = re.compile('PKG_CHECK_EXISTS\(\[?([^,\]])\]?[),].')	417	pkgce_re = re.compile('PKG_CHECK_EXISTS\(\s\[?([^,\]])\]?[),].*')
418	lib_re = re.compile('AC_CHECK_LIB\(\[?([^,\]])\]?,.')	418	lib_re = re.compile('AC_CHECK_LIB\(\s\[?([^,\]])\]?,.*')
419	libx_re = re.compile('AX_CHECK_LIBRARY\(\[?[^,\]]\]?, \[?([^,\]])\]?, \[?([a-zA-Z0-9-])\]?,.')	419	libx_re = re.compile('AX_CHECK_LIBRARY\(\s\[?[^,\]]\]?,\s\[?([^,\]])\]?,\s\[?([a-zA-Z0-9-])\]?,.*')
420	progs_re = re.compile('_PROGS?\(\[?[a-zA-Z0-9_]\]?, \[?([^,\]])\]?[),].*')	420	progs_re = re.compile('_PROGS?\(\s\[?[a-zA-Z0-9_]\]?,\s\[?([^,\]])\]?[),].*')
421	dep_re = re.compile('([^ ><=]+)( [<>=]+ [^ ><=]+)?')	421	dep_re = re.compile('([^ ><=]+)( [<>=]+ [^ ><=]+)?')
422	ac_init_re = re.compile('AC_INIT\(([^,]+), ([^,]+)[,)].')	422	ac_init_re = re.compile('AC_INIT\(\s([^,]+),\s([^,]+)[,)].*')
423	am_init_re = re.compile('AM_INIT_AUTOMAKE\(([^,]+), ([^,]+)[,)].')	423	am_init_re = re.compile('AM_INIT_AUTOMAKE\(\s([^,]+),\s([^,]+)[,)].*')
424	define_re = re.compile(' (m4_)?define\(([^,]+), ([^,]+)\)')	424	define_re = re.compile('\s(m4_)?define\(\s([^,]+),\s*([^,]+)\)')
425		425
426	defines = {}	426	defines = {}
427	def subst_defines(value):	427	def subst_defines(value):