chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0ef4038
)
build-sys: make bzip2 really optional
author
Lennart Poettering
<lennart@poettering.net>
Tue, 27 Jan 2015 16:24:11 +0000
(17:24 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 27 Jan 2015 16:58:57 +0000
(17:58 +0100)
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index cf19681c851d6cb3c1913984b33471f2b471acbe..d576e0409e2979e99ba9ade9631d878e22facbdc 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-580,11
+580,13
@@
AM_CONDITIONAL(HAVE_ZLIB, [test "$have_zlib" = "yes"])
# ------------------------------------------------------------------------------
have_bzip2=no
# ------------------------------------------------------------------------------
have_bzip2=no
-AC_ARG_ENABLE(bzip2, AS_HELP_STRING([--enable-bzip2], [
En
able optional BZIP2 support]))
+AC_ARG_ENABLE(bzip2, AS_HELP_STRING([--enable-bzip2], [
Dis
able optional BZIP2 support]))
AS_IF([test "x$enable_bzip2" != "xno"], [
AC_CHECK_HEADERS(bzlib.h,
AS_IF([test "x$enable_bzip2" != "xno"], [
AC_CHECK_HEADERS(bzlib.h,
- [AC_DEFINE(HAVE_BZIP2, 1, [Define in BZIP2 is available]) have_bzip2=yes],
- [AC_MSG_ERROR([*** BZIP2 support requested but headers not found])])
+ [AC_DEFINE(HAVE_BZIP2, 1, [Define in BZIP2 is available])
+ have_bzip2=yes],
+ [AS_IF([test "x$have_bzip2" = xyes], [AC_MSG_ERROR([*** BZIP2 support requested but headers not found])])
+ ])
])
AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])
])
AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])