diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2018-08-20 11:18:35 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2018-08-20 11:18:35 +0000 |
commit | bad3cf114631f02c2f88de387e82b14591e7cb39 (patch) | |
tree | 9b6583a5415b5ddb481ca6890f391909db412b4c /configure | |
parent | 4ad1fcff8e03ff2f7d713f83441fd5ea8042c623 (diff) | |
download | s6-bad3cf114631f02c2f88de387e82b14591e7cb39.tar.gz s6-bad3cf114631f02c2f88de387e82b14591e7cb39.tar.xz s6-bad3cf114631f02c2f88de387e82b14591e7cb39.zip |
Better support for slashpackage nsss builds
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/configure b/configure index 68d89d2..c147abb 100755 --- a/configure +++ b/configure @@ -250,12 +250,19 @@ if $slashpackage ; then libdir=${home}/library libexecdir=$bindir includedir=${home}/include - while read dep ; do - addincpath="$addincpath -I${sproot}${dep}/include" - vpaths="$vpaths ${sproot}${dep}/library" - addlibspath="$addlibspath -L${sproot}${dep}/library" - vpathd="$vpathd ${sproot}${dep}/library.so" - addlibdpath="$addlibdpath -L${sproot}${dep}/library.so" + while read dep condvar ; do + if test -n "$condvar" ; then + eval "cond=$condvar" + else + cond=true + fi + if $cond ; then + addincpath="$addincpath -I${sproot}${dep}/include" + vpaths="$vpaths ${sproot}${dep}/library" + addlibspath="$addlibspath -L${sproot}${dep}/library" + vpathd="$vpathd ${sproot}${dep}/library.so" + addlibdpath="$addlibdpath -L${sproot}${dep}/library.so" + fi done < package/deps-build fi |