From 80460c48ad1553dcb3396a70ccd86e9194371277 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 23 Sep 2024 20:16:03 +0000 Subject: Update deps; align configure to rest of skaware Signed-off-by: Laurent Bercot --- INSTALL | 6 +++--- configure | 18 +++++------------- doc/index.html | 6 +++--- doc/upgrade.html | 8 +++++++- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/INSTALL b/INSTALL index c09d868..f81b585 100644 --- a/INSTALL +++ b/INSTALL @@ -6,9 +6,9 @@ Build Instructions - A Linux-based system with a standard C development environment - GNU make version 3.81 or later - - skalibs version 2.14.2.1 or later: https://skarnet.org/software/skalibs/ - - optional: nsss version 0.2.0.4 or later: https://skarnet.org/software/nsss/ - - optional: execline version 2.9.6.0 or later: https://skarnet.org/software/execline/ + - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/ + - optional: nsss version 0.2.0.5 or later: https://skarnet.org/software/nsss/ + - optional: execline version 2.9.6.1 or later: https://skarnet.org/software/execline/ This software is Linux-specific. It will run on a Linux kernel, version 2.6.10 or later. diff --git a/configure b/configure index 95cf2cb..c4a69c7 100755 --- a/configure +++ b/configure @@ -21,11 +21,11 @@ Fine tuning of the installation directories: --dynlibdir=DIR shared library files [PREFIX/lib] --bindir=BINDIR user executables [EPREFIX/bin] --libexecdir=DIR package-scoped executables [EPREFIX/libexec] - --libdir=DIR static library files [PREFIX/lib/$package] + --libdir=DIR static library files [PREFIX/lib] --includedir=DIR C header files [PREFIX/include] If no --prefix option is given, by default libdir (but not dynlibdir) will be - /usr/lib/$package, and includedir will be /usr/include. + /usr/lib, and includedir will be /usr/include. Dependencies: --with-sysdeps=DIR use sysdeps in DIR [PREFIX/lib/skalibs/sysdeps] @@ -139,7 +139,7 @@ exec_prefix='$prefix' dynlibdir='$prefix/lib' libexecdir='$exec_prefix/libexec' bindir='$exec_prefix/bin' -libdir='$prefix/lib/$package' +libdir='$prefix/lib' includedir='$prefix/include' sysdeps='$prefix/lib/skalibs/sysdeps' manualsysdeps=false @@ -203,8 +203,8 @@ done # Add /usr in the default default case if test -z "$prefix" ; then - if test "$libdir" = '$prefix/lib/$package' ; then - libdir=/usr/lib/$package + if test "$libdir" = '$prefix/lib' ; then + libdir=/usr/lib fi if test "$includedir" = '$prefix/include' ; then includedir=/usr/include @@ -361,14 +361,6 @@ fi LDFLAGS_SHARED="${LDFLAGS_SHARED}${addlibdpath}" -if test -z "$vpaths" ; then - while read dep ; do - base=$(basename $dep) ; - vpaths="$vpaths /usr/lib/$base" - addlibspath="$addlibspath -L/usr/lib/$base" - done < package/deps-build -fi - if $allstatic ; then LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibspath}" tryldflag LDFLAGS_NOSHARED -Wl,--gc-sections diff --git a/doc/index.html b/doc/index.html index a9ff0f2..b0e60ce 100644 --- a/doc/index.html +++ b/doc/index.html @@ -102,16 +102,16 @@ and does not pull in any unnecessary code. The Linux kernel must be 2.6.10 or later.
  • GNU make, version 3.81 or later
  • skalibs version -2.14.2.1 or later. It's a build-time requirement. It's also a run-time +2.14.3.0 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs library.
  • Optionally: nsss -version 0.2.0.4 or later. It's a build-time and run-time requirement, if +version 0.2.0.5 or later. It's a build-time and run-time requirement, if you use the --enable-nsss option to configure; but you would only do that if you're replacing nsswitch on your whole system, and most people are not.
  • Optionally: execline -version 2.9.6.0 or later. It's a only a run-time requirement, and only +version 2.9.6.1 or later. It's a only a run-time requirement, and only if your mdev.conf file contains +, - or & command directives.
    • diff --git a/doc/upgrade.html b/doc/upgrade.html index 8933613..552d36a 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -22,7 +22,13 @@

    in 0.1.6.4

    -- cgit v1.3.1