diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-05-25 00:25:15 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-05-25 00:25:15 +0200 |
| commit | 57df83e07d4b5e78d9a54c1a88d05b4a9ed65714 (patch) | |
| tree | 76684e63965e9ad6e37d9d45bc3159e6c9782cd0 /m4/guix.m4 | |
| parent | 43d9ed7792808638eabb43aa6133f1d6186c520b (diff) | |
| parent | 136b7d81f0eb713783e9ea7cf7f260a2b6252dfd (diff) | |
| download | patches-57df83e07d4b5e78d9a54c1a88d05b4a9ed65714.tar patches-57df83e07d4b5e78d9a54c1a88d05b4a9ed65714.tar.gz | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'm4/guix.m4')
| -rw-r--r-- | m4/guix.m4 | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/m4/guix.m4 b/m4/guix.m4 index 5c846f7618..d0c5ec0f08 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -1,5 +1,5 @@ dnl GNU Guix --- Functional package management for GNU -dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org> +dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org> dnl Copyright © 2014 Mark H Weaver <mhw@netris.org> dnl Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> dnl @@ -312,6 +312,21 @@ AC_DEFUN([GUIX_LIBZ_LIBDIR], [ $1="$guix_cv_libz_libdir" ]) +dnl GUIX_LIBLZ_FILE_NAME VAR +dnl +dnl Attempt to determine liblz's absolute file name; store the result in VAR. +AC_DEFUN([GUIX_LIBLZ_FILE_NAME], [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_CACHE_CHECK([lzlib's file name], + [guix_cv_liblz_libdir], + [old_LIBS="$LIBS" + LIBS="-llz" + AC_LINK_IFELSE([AC_LANG_SOURCE([int main () { return LZ_decompress_open(); }])], + [guix_cv_liblz_libdir="`ldd conftest$EXEEXT | grep liblz | sed '-es/.*=> \(.*\) .*$/\1/g'`"]) + LIBS="$old_LIBS"]) + $1="$guix_cv_liblz_libdir" +]) + dnl GUIX_CURRENT_LOCALSTATEDIR dnl dnl Determine the localstatedir of an existing Guix installation and set |