diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 36 |
1 files changed, 29 insertions, 7 deletions
@@ -25,11 +25,12 @@ Fine tuning of the installation directories: --includedir=DIR C header files [PREFIX/include] --sysconfdir=DIR global configuration files [PREFIX/etc] --pkgconfdir=DIR pkg-config .pc files [PREFIX/lib/pkgconfig] - --scandir=DIR assume s6-svscan is running on DIR [s6li default|/run/service] - --livedir=DIR run s6-rc live directory in DIR [s6-rc default|/run/s6-rc] - --repodir=DIR s6-frontend working base [/var/lib/s6-frontend/repository] + --scandir=DIR assume s6-svscan is running on DIR [s6li default: /run/service] + --livedir=DIR run s6-rc live directory in DIR [s6-rc default: /run/s6-rc] + --repodir=DIR default s6-rc repository [s6-rc default: /var/lib/s6-frontend/repository] --bootdir=DIR location of the bootable s6-rc compiled db [/etc/s6-rc] --stmpdir=DIR secure location for temporary s6-frontend files [/run/s6-frontend] + --conffile=FILE default configuration file for s6 command [SYSCONFDIR/s6-frontend.conf] --with-def-path=PATH path to service files [LIBDIR/s6-frontend/s6-rc/source:SYSCONFDIR/s6-frontend/s6-rc/source] If no --prefix option is given, by default libdir (but not dynlibdir) will be /usr/lib, and includedir will be /usr/include. @@ -53,6 +54,7 @@ Optional features: --enable-pkgconfig Build and install .pc files for pkg-config [disabled] --enable-slashpackage[=ROOT] assume /package installation at ROOT [disabled] --enable-absolute-paths hardcode absolute BINDIR/foobar paths in binaries [disabled] + --enable-nsss use the nsss library for user information [disabled] --disable-s6li do not use s6-linux-init functionality [enabled] --enable-util-linux use util-linux functionality [disabled] --enable-aliases-daemontools build emulation of daemontools programs [disabled] @@ -183,7 +185,9 @@ livedir= repodir=/var/lib/s6-frontend/s6-rc/repository bootdir=/etc/s6-rc stmpdir=/run/s6-frontend +conffile='$sysconfdir/s6-frontend.conf' defpath='$libdir/s6-frontend/s6-rc/source:$sysconfdir/s6-frontend/s6-rc/source' +usensss=false uses6li=true useutillinux=false adaemontools=false @@ -231,7 +235,10 @@ for arg ; do --repodir=*) repodir=${arg#*=} ;; --bootdir=*) bootdir=${arg#*=} ;; --stmpdir=*) stmpdir=${arg#*=} ;; + --conffile=*) conffile=${arg#*=} ;; --with-def-path=*) defpath=${arg#*=} ;; + --enable-nsss|--enable-nsss=yes) usensss=true ;; + --disable-nsss|--enable-nsss=no) usensss=false ;; --enable-s6li|--enable-s6li=yes) uses6li=true ;; --disable-s6li|--enable-s6li=no) uses6li=false ;; --enable-util-linux|--enable-util-linux=yes) useutillinux=true ;; @@ -270,7 +277,7 @@ fi # Expand installation directories stripdir prefix -for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot stmpdir defpath ; do +for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot stmpdir conffile defpath ; do eval tmp=\${$i} eval $i=$tmp stripdir $i @@ -547,13 +554,18 @@ if $allpic ; then else echo "STATIC_LIBS_ARE_PIC :=" fi -echo "LIBNSSS := -lnsss" -echo "MAYBEPTHREAD_LIB := -lpthread" echo "REPODIR := $repodir" echo "BOOTDIR := $bootdir" echo "STMPDIR := $stmpdir" echo "DEFPATH := $defpath" +if $usensss ; then + echo "LIBNSSS := -lnsss" + echo "MAYBEPTHREAD_LIB := -lpthread" +else + echo "LIBNSSS :=" + echo "MAYBEPTHREAD_LIB :=" +fi if $adaemontools ; then echo "WRAP_DAEMONTOOLS := 1" else @@ -630,7 +642,14 @@ else fi echo "#undef ${package_macro_name}_REPODIR" -echo "#define ${package_macro_name}_REPODIR \"$repodir\"" +if test -n "$repodir" ; then + echo "#define ${package_macro_name}_REPODIR \"$repodir\"" +else + if test -n "$livedir" ; then + echo "#include <s6-rc/config.h>" + fi + echo "#define ${package_macro_name}_REPODIR S6RC_REPO_BASE" +fi echo "#undef ${package_macro_name}_BOOTDIR" echo "#define ${package_macro_name}_BOOTDIR \"$bootdir\"" @@ -638,6 +657,9 @@ echo "#define ${package_macro_name}_BOOTDIR \"$bootdir\"" echo "#undef ${package_macro_name}_STMPDIR" echo "#define ${package_macro_name}_STMPDIR \"$stmpdir\"" +echo "#undef ${package_macro_name}_CONFFILE" +echo "#define ${package_macro_name}_CONFFILE \"$conffile\"" + echo "#undef ${package_macro_name}_DEFPATH" echo "#define ${package_macro_name}_DEFPATH \"$defpath\"" |