Skip to content
Snippets Groups Projects
Commit 20ef1b87 authored by Markus Blatt's avatar Markus Blatt
Browse files

[bugfix,buildsystem] Force searching for installed packages with pkg-config, again.

Somewhere along the many changes we stopped forcing usage of pkg-config when
testing for installed versions of modules during configure. Without using
pkg-config there is no way of detecting custom installation parts used by
the user. In my case, this broke finding modules installed via cmake from
modules that are to built with autotools.

This patch forces DUNE_CHECK_MODULE to use pkg-config to setup the paths for
installed modules by dunecontrol not provinding --with-module=<path> to configure
for installed modules.
parent 5944dbce
No related branches found
No related tags found
No related merge requests found
......@@ -638,7 +638,9 @@ run_default_configure () {
if test -d "$path/$BUILDDIR"; then
PARAMS="$PARAMS \"--with-$name=$path/$BUILDDIR\""
else
PARAMS="$PARAMS \"--with-$name=$path\""
if test x$module_inst != xyes; then
PARAMS="$PARAMS \"--with-$name=$path\""
fi
fi
if test "x$LOCAL_USE_CMAKE" = "xyes"; then
if test -d "$path/$BUILDDIR"; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment