diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2018-08-20 11:28:59 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2018-08-20 11:28:59 +0000 |
| commit | ffe0c41d9863328fdb00ee8513c8829af621bc6e (patch) | |
| tree | 79f0a3b20abd575e0be54ebfba0204e6e97947fa | |
| parent | 0a7251045255a3e41bad384738a5c5296750d061 (diff) | |
| download | pamela-ffe0c41d9863328fdb00ee8513c8829af621bc6e.tar.gz pamela-ffe0c41d9863328fdb00ee8513c8829af621bc6e.tar.xz pamela-ffe0c41d9863328fdb00ee8513c8829af621bc6e.zip | |
Add support for conditional slashpackage builds. Update deps.
| -rw-r--r-- | INSTALL | 2 | ||||
| -rwxr-xr-x | configure | 19 | ||||
| -rw-r--r-- | doc/index.html | 2 |
3 files changed, 15 insertions, 8 deletions
diff --git a/INSTALL b/INSTALL index 72b4d2e..c4aeed8 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,7 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.6.3.2 or later: http://skarnet.org/software/skalibs/ + - skalibs version 2.7.0.0 or later: http://skarnet.org/software/skalibs/ - Linux-PAM version 1.3.0 or later: http://www.linux-pam.org/library/ This software will run on any operating system that implements diff --git a/configure b/configure index f94fcf1..c9bb50d 100755 --- a/configure +++ b/configure @@ -246,12 +246,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 diff --git a/doc/index.html b/doc/index.html index b7cd020..da6d074 100644 --- a/doc/index.html +++ b/doc/index.html @@ -63,7 +63,7 @@ for privilege elevation. that supports Linux-PAM - (so, probably a Linux system) </li> <li> GNU make, version 3.81 or later </li> <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version -2.6.3.2 or later. It's a build-time requirement and a run-time +2.7.0.0 or later. It's a build-time requirement and a run-time requirement. </li> <li> <a href="http://www.linux-pam.org/">Linux-PAM</a> version 1.3.0 or later. It's a build-time requirement and a run-time requirement. </li> |