summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2022-06-10 20:55:06 +0200
committerDaniel Friesel <derf@finalrewind.org>2022-06-10 20:55:06 +0200
commit16b08055436194ff4ae0ac70fea77e8cc97cf840 (patch)
tree2b24d439823c5c6e7d8b3dce13c2f7b3ad6393a9
parentcd02c0eacef0c080c2d62a097142cebbeaa0ba78 (diff)
do not enable libmagic by default
-rw-r--r--README.md7
-rw-r--r--config.mk2
2 files changed, 6 insertions, 3 deletions
diff --git a/README.md b/README.md
index c4cb7ef..6828a19 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,6 @@ Dependencies
* Imlib2
* libcurl (disable with make curl=0)
- * libmagic (disable with make magic=0)
* libpng
* libX11
* libXinerama (disable with make xinerama=0)
@@ -32,6 +31,10 @@ If built with exif=1:
* libexif-dev
* libexif12
+If built with magic=1:
+
+ * libmagic
+
Recommended Binaries
---
@@ -92,7 +95,7 @@ indicates that the corresponding feature is enabled by default.
| help | 0 | include help text (refers to the manpage otherwise) |
| inotify | 0 | enable inotify, needed for `--auto-reload` |
| stat64 | 0 | Support CIFS shares from 64bit hosts on 32bit machines |
-| magic | 1 | Build against libmagic to filter unsupported file formats |
+| magic | 0 | Use libmagic to filter unsupported file formats |
| mkstemps | 1 | Whether your libc provides `mkstemps()`. If set to 0, feh will be unable to load gif images via libcurl |
| verscmp | 1 | Whether your libc provides `strvercmp()`. If set to 0, feh will use an internal implementation. |
| xinerama | 1 | Support Xinerama/XRandR multiscreen setups |
diff --git a/config.mk b/config.mk
index 910eac7..6c85e05 100644
--- a/config.mk
+++ b/config.mk
@@ -6,7 +6,7 @@ curl ?= 1
debug ?= 0
exif ?= 0
help ?= 0
-magic ?= 1
+magic ?= 0
mkstemps ?= 1
verscmp ?= 1
xinerama ?= 1