diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-07-18 23:14:14 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-07-19 00:07:12 +0200 |
| commit | 721539026dda02e58addbb618f2102b31a2927f8 (patch) | |
| tree | adbf4ef7de758050ea1de575f3f0be2f5982295d /m4 | |
| parent | 2c2ec261a8d3c37e5147038f47ad24c57cde4134 (diff) | |
| download | gnu-guix-721539026dda02e58addbb618f2102b31a2927f8.tar gnu-guix-721539026dda02e58addbb618f2102b31a2927f8.tar.gz | |
Add (guix zlib).
* guix/zlib.scm, tests/zlib.scm: New files.
* Makefile.am (MODULES): Add guix/zlib.scm.
(SCM_TESTS): Add tests/zlib.scm.
* m4/guix.m4 (GUIX_LIBGCRYPT_LIBDIR): New macro.
* configure.ac (LIBGCRYPT_LIBDIR): Use it. Define and substitute
'LIBZ'.
* guix/config.scm.in (%libz): New variable.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/guix.m4 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/m4/guix.m4 b/m4/guix.m4 index 2d3dfd282e..a4f83f029a 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -308,6 +308,17 @@ AC_DEFUN([GUIX_LIBGCRYPT_LIBDIR], [ $1="$guix_cv_libgcrypt_libdir" ]) +dnl GUIX_LIBZ_LIBDIR VAR +dnl +dnl Attempt to determine libz's LIBDIR; store the result in VAR. +AC_DEFUN([GUIX_LIBZ_LIBDIR], [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_CACHE_CHECK([zlib's library directory], + [guix_cv_libz_libdir], + [guix_cv_libz_libdir="`$PKG_CONFIG zlib --variable=libdir 2> /dev/null`"]) + $1="$guix_cv_libz_libdir" +]) + dnl GUIX_CURRENT_LOCALSTATEDIR dnl dnl Determine the localstatedir of an existing Guix installation and set |