Configure: check pkg-config before BlueZ

kghost · kghost · commit e1a1c5a8f378 · 2020-04-20T15:29:12.000+08:00
Because NL_WITH_OPTIONAL_INTERNAL_PACKAGE may use pkg-config to find
external BlueZ library, pkg-config must be checked before it.

Change-Id: If48d395bf6da2db03c608efe7603ee37273c40a8
diff --git a/configure.ac b/configure.ac
@@ -1359,6 +1359,10 @@ if test "${CONFIG_DEVICE_LAYER}" = 1; then
 fi
 
 
+# Check if the build host has pkg-config
+
+AC_PATH_PROG([PKG_CONFIG],[pkg-config])
+
 #
 # WoBle over Bluez Peripheral support
 #
@@ -2030,10 +2034,6 @@ AC_LANG_POP([C++])
 #
 AC_MSG_NOTICE([checking package dependencies])
 
-# Check if the build host has pkg-config
-
-AC_PATH_PROG([PKG_CONFIG],[pkg-config])
-
 #
 # CuRL
 #

Original file line number	Diff line number	Diff line change
`@@ -1359,6 +1359,10 @@ if test "${CONFIG_DEVICE_LAYER}" = 1; then`
`1359`	`1359`	`fi`
`1360`	`1360`
`1361`	`1361`
	`1362`	`+# Check if the build host has pkg-config`
	`1363`	`+`
	`1364`	`+AC_PATH_PROG([PKG_CONFIG],[pkg-config])`
	`1365`	`+`
`1362`	`1366`	`#`
`1363`	`1367`	`# WoBle over Bluez Peripheral support`
`1364`	`1368`	`#`
`@@ -2030,10 +2034,6 @@ AC_LANG_POP([C++])`
`2030`	`2034`	`#`
`2031`	`2035`	`AC_MSG_NOTICE([checking package dependencies])`
`2032`	`2036`
`2033`		`-# Check if the build host has pkg-config`
`2034`		`-`
`2035`		`-AC_PATH_PROG([PKG_CONFIG],[pkg-config])`
`2036`		`-`
`2037`	`2037`	`#`
`2038`	`2038`	`# CuRL`
`2039`	`2039`	`#`