From 4db015a0d7b5345e34e4fec763d31c2bbbaf3ee5 Mon Sep 17 00:00:00 2001 From: Karl Linden Date: Sat, 26 Sep 2015 22:58:21 +0200 Subject: [PATCH 1/2] Check packages before anything else so use variables can be used in checks. This makes sure header checks work when the third party package is installed in a non-standard location, as long as a pkg-config file is found. --- wscript | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/wscript b/wscript index 73f7fff2..a78bcd7a 100644 --- a/wscript +++ b/wscript @@ -187,10 +187,23 @@ class AutoOption: """ all_found = True + # Use-variables that should be used when checking libraries, headers and + # programs. The list will be populated when looking for packages. + use = [] + + # check for packages + for package,uselib_store,atleast_version in self.packages: + try: + conf.check_cfg(package=package, uselib_store=uselib_store, atleast_version=atleast_version, args='--cflags --libs') + use.append(uselib_store) + except conf.errors.ConfigurationError: + all_found = False + self.packages_not_found.append([package,atleast_version]) + # check for libraries for lib,uselib_store in self.libs: try: - conf.check_cc(lib=lib, uselib_store=uselib_store) + conf.check_cc(lib=lib, uselib_store=uselib_store, use=use) except conf.errors.ConfigurationError: all_found = False self.libs_not_found.append(lib) @@ -198,23 +211,15 @@ class AutoOption: # check for headers for header in self.headers: try: - conf.check_cc(header_name=header) + conf.check_cc(header_name=header, use=use) except conf.errors.ConfigurationError: all_found = False self.headers_not_found.append(header) - # check for packages - for package,uselib_store,atleast_version in self.packages: - try: - conf.check_cfg(package=package, uselib_store=uselib_store, atleast_version=atleast_version, args='--cflags --libs') - except conf.errors.ConfigurationError: - all_found = False - self.packages_not_found.append([package,atleast_version]) - # check for programs for program,var in self.programs: try: - conf.find_program(program, var=var) + conf.find_program(program, var=var, use=use) except conf.errors.ConfigurationError: all_found = False self.programs_not_found.append(program) From 790243f357159388ce3b862839e82a743bdcf57b Mon Sep 17 00:00:00 2001 From: Karl Linden Date: Sat, 12 Dec 2015 23:36:11 +0100 Subject: [PATCH 2/2] Remove unused file config.h.in. --- config.h.in | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 config.h.in diff --git a/config.h.in b/config.h.in deleted file mode 100644 index e356790d..00000000 --- a/config.h.in +++ /dev/null @@ -1,17 +0,0 @@ -/* config.h.in. */ -#ifndef CONFIG_H -#define CONFIG_H - -/* Name of package */ -#define PACKAGE $PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -#define ADDON_DIR "$ADDON_DIR" - -#define JACK_LOCATION "$JACK_LOCATION" - -#define JACK_SVNREVISION "$JACK_SVNREVISION" - -#endif // CONFIG_H