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 /configure.ac | |
| parent | 5d4c90ae02f1e0b42d575bba2d828d63aaf79be5 (diff) | |
| parent | 5f01078129f4eaa4760a14f22761cf357afb6738 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 1f5c549aee6..20adf85f0b0 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -189,6 +189,17 @@ AC_SUBST([LIBGCRYPT_LIBDIR]) | |||
| 189 | 189 | ||
| 190 | GUIX_ASSERT_LIBGCRYPT_USABLE | 190 | GUIX_ASSERT_LIBGCRYPT_USABLE |
| 191 | 191 | ||
| 192 | dnl Library name of zlib suitable for 'dynamic-link'. | ||
| 193 | GUIX_LIBZ_LIBDIR([libz_libdir]) | ||
| 194 | if test "x$libz_libdir" = "x"; then | ||
| 195 | LIBZ="libz" | ||
| 196 | else | ||
| 197 | LIBZ="$libz_libdir/libz" | ||
| 198 | fi | ||
| 199 | AC_MSG_CHECKING([for zlib's shared library name]) | ||
| 200 | AC_MSG_RESULT([$LIBZ]) | ||
| 201 | AC_SUBST([LIBZ]) | ||
| 202 | |||
| 192 | AC_CACHE_SAVE | 203 | AC_CACHE_SAVE |
| 193 | 204 | ||
| 194 | m4_include([config-daemon.ac]) | 205 | m4_include([config-daemon.ac]) |