diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-07-20 11:42:02 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-07-20 11:42:17 +0200 |
| commit | 7575655212ecfbcd1f04e429c8a7a41f8720d027 (patch) | |
| tree | 558982d3cf50ef6b19ef293850de1f485fde66a6 /m4/guix.m4 | |
| parent | 5d4c90ae02f1e0b42d575bba2d828d63aaf79be5 (diff) | |
| parent | 5f01078129f4eaa4760a14f22761cf357afb6738 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'm4/guix.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 654789e1d9b..949ae4ca7c6 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 | |||
| @@ -295,6 +295,17 @@ AC_DEFUN([GUIX_LIBGCRYPT_LIBDIR], [ | |||
| 295 | $1="$guix_cv_libgcrypt_libdir" | 295 | $1="$guix_cv_libgcrypt_libdir" |
| 296 | ]) | 296 | ]) |
| 297 | 297 | ||
| 298 | dnl GUIX_LIBZ_LIBDIR VAR | ||
| 299 | dnl | ||
| 300 | dnl Attempt to determine libz's LIBDIR; store the result in VAR. | ||
| 301 | AC_DEFUN([GUIX_LIBZ_LIBDIR], [ | ||
| 302 | AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
| 303 | AC_CACHE_CHECK([zlib's library directory], | ||
| 304 | [guix_cv_libz_libdir], | ||
| 305 | [guix_cv_libz_libdir="`$PKG_CONFIG zlib --variable=libdir 2> /dev/null`"]) | ||
| 306 | $1="$guix_cv_libz_libdir" | ||
| 307 | ]) | ||
| 308 | |||
| 298 | dnl GUIX_CURRENT_LOCALSTATEDIR | 309 | dnl GUIX_CURRENT_LOCALSTATEDIR |
| 299 | dnl | 310 | dnl |
| 300 | dnl Determine the localstatedir of an existing Guix installation and set | 311 | dnl Determine the localstatedir of an existing Guix installation and set |