summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2018-08-01 20:46:20 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2018-08-01 20:46:20 +0000
commit75c0b42b21916689fa098e43d33ff06d4c45d76a (patch)
tree21789d8fde91a25125ced8af5c6cba392b09ee06
parent2f735b09699132baa32f6ab57bcea5417e4aa4ff (diff)
downloadmdevd-75c0b42b21916689fa098e43d33ff06d4c45d76a.tar.xz
Add nsss support
-rwxr-xr-xconfigure11
-rw-r--r--package/deps.mak4
-rw-r--r--src/mdevd/deps-exe/mdevd2
3 files changed, 15 insertions, 2 deletions
diff --git a/configure b/configure
index d8c3307..d51a466 100755
--- a/configure
+++ b/configure
@@ -45,6 +45,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]
EOF
exit 0
@@ -149,6 +150,7 @@ static=true
allpic=detect
slashpackage=false
abspath=false
+usensss=false
sproot=
home=
exthome=
@@ -191,6 +193,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 2d9cd98..2e717e3 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -5,7 +5,7 @@
src/mdevd/mdevd-coldplug.o src/mdevd/mdevd-coldplug.lo: src/mdevd/mdevd-coldplug.c
src/mdevd/mdevd.o src/mdevd/mdevd.lo: src/mdevd/mdevd.c
-mdevd: EXTRA_LIBS :=
-mdevd: src/mdevd/mdevd.o -lskarnet
+mdevd: EXTRA_LIBS := ${MAYBEPTHREAD_LIB}
+mdevd: src/mdevd/mdevd.o ${LIBNSSS} -lskarnet
mdevd-coldplug: EXTRA_LIBS :=
mdevd-coldplug: src/mdevd/mdevd-coldplug.o -lskarnet
diff --git a/src/mdevd/deps-exe/mdevd b/src/mdevd/deps-exe/mdevd
index e7187fe..ee4ed0b 100644
--- a/src/mdevd/deps-exe/mdevd
+++ b/src/mdevd/deps-exe/mdevd
@@ -1 +1,3 @@
+${LIBNSSS}
-lskarnet
+${MAYBEPTHREAD_LIB}