diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2018-08-01 20:42:04 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2018-08-01 20:42:04 +0000 |
| commit | 9276c41b34f90fb20bbb628ff7d5d6c44cf4b90f (patch) | |
| tree | 56caa9bc6ecbdf37542e6b6fe8f105fc5742be80 | |
| parent | bd20906402bc1a41e60deab956218a799e4cb8aa (diff) | |
| download | utmps-9276c41b34f90fb20bbb628ff7d5d6c44cf4b90f.tar.xz | |
Add nsss support
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | package/deps.mak | 4 | ||||
| -rw-r--r-- | src/utmps/deps-exe/utmps-utmpd | 2 |
3 files changed, 15 insertions, 2 deletions
@@ -44,6 +44,7 @@ Optional features: --enable-slashpackage[=ROOT] assume /package installation at ROOT [disabled] --enable-absolute-paths do not rely on PATH to access this package's binaries, hardcode absolute BINDIR/foobar paths instead [disabled] + --enable-nsss use the nsss library for user information [disabled] --with-utmpd-socket=PATH assume the utmpd socket is at PATH [/run/utmps/.utmpd-socket] --with-wtmpd-socket=PATH assume the wtmpd socket is at PATH [/run/utmps/.wtmpd-socket] @@ -149,6 +150,7 @@ static=true allpic=detect slashpackage=false abspath=false +usensss=false sproot= home= exthome= @@ -192,6 +194,8 @@ for arg ; do --disable-slashpackage) sproot= ; slashpackage=false ;; --enable-absolute-paths|--enable-absolute-paths=yes) abspath=true ;; --disable-absolute-paths|--enable-absolute-paths=no) abspath=false ;; + --enable-nsss|--enable-nsss=yes) usensss=true ;; + --disable-nsss|--enable-nsss=no) usensss=false ;; --enable-*|--disable-*|--with-*|--without-*|--*dir=*) ;; --host=*|--target=*) target=${arg#*=} ;; --build=*) build=${arg#*=} ;; @@ -434,6 +438,13 @@ if $allpic ; then else echo "STATIC_LIBS_ARE_PIC :=" fi +if $usensss ; then + echo "LIBNSSS := -lnsss" + echo "MAYBEPTHREAD_LIB := -lpthread" +else + echo "LIBNSSS :=" + echo "MAYBEPTHREAD_LIB :=" +fi exec 1>&3 3>&- echo " ... done." diff --git a/package/deps.mak b/package/deps.mak index 7d9b6b0..9ec3964 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -36,7 +36,7 @@ libutmps.a.xyzzy: src/utmps/endutxent.lo src/utmps/getutxent.lo src/utmps/getutx endif libutmps.so.xyzzy: EXTRA_LIBS := -lskarnet libutmps.so.xyzzy: src/utmps/endutxent.lo src/utmps/getutxent.lo src/utmps/getutxid.lo src/utmps/getutxline.lo src/utmps/logwtmp.lo src/utmps/pututxline.lo src/utmps/setutxent.lo src/utmps/updwtmpx.lo src/utmps/utmpxname.lo src/utmps/utmps_end.lo src/utmps/utmps_getent.lo src/utmps/utmps_getid.lo src/utmps/utmps_getline.lo src/utmps/utmps_here.lo src/utmps/utmps_here_maybe_init.lo src/utmps/utmps_putline.lo src/utmps/utmps_rewind.lo src/utmps/utmps_start.lo src/utmps/utmps_updwtmpx.lo src/utmps/utmps_utmpx_pack.lo src/utmps/utmps_utmpx_unpack.lo -utmps-utmpd: EXTRA_LIBS := -utmps-utmpd: src/utmps/utmps-utmpd.o libutmps.a.xyzzy -lskarnet +utmps-utmpd: EXTRA_LIBS := ${MAYBEPTHREAD_LIB} +utmps-utmpd: src/utmps/utmps-utmpd.o libutmps.a.xyzzy ${LIBNSSS} -lskarnet utmps-wtmpd: EXTRA_LIBS := utmps-wtmpd: src/utmps/utmps-wtmpd.o libutmps.a.xyzzy -lskarnet diff --git a/src/utmps/deps-exe/utmps-utmpd b/src/utmps/deps-exe/utmps-utmpd index 60d8fd7..4abb735 100644 --- a/src/utmps/deps-exe/utmps-utmpd +++ b/src/utmps/deps-exe/utmps-utmpd @@ -1,2 +1,4 @@ libutmps.a.xyzzy +${LIBNSSS} -lskarnet +${MAYBEPTHREAD_LIB} |