summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2012-01-28 00:05:53 +0100
committerDaniel Friesel <derf@finalrewind.org>2012-01-28 00:05:53 +0100
commitcbec7b15d0355926a504e2404f435cf3ab0e5b36 (patch)
treed6c2bbf77710460b5b8d690f38e0fb459a90edfb
parent4252f6eb96ef00d5907dceda3af8c581917d7aa1 (diff)
downloadfeh-cbec7b15d0355926a504e2404f435cf3ab0e5b36.zip
Show exif flag in manpage / --version
-rw-r--r--config.mk3
-rw-r--r--man/Makefile1
-rw-r--r--man/feh.pre2
-rw-r--r--src/options.c4
4 files changed, 9 insertions, 1 deletions
diff --git a/config.mk b/config.mk
index d2b038b..501ec89 100644
--- a/config.mk
+++ b/config.mk
@@ -57,6 +57,9 @@ endif
ifeq (${exif},1)
CFLAGS += -DHAVE_LIBEXIF
LDLIBS += -lexif
+ MAN_EXIF = enabled
+else
+ MAN_EXIF = disabled
endif
diff --git a/man/Makefile b/man/Makefile
index f03b9d7..1927963 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -11,6 +11,7 @@ all: ${TARGETS}
-e 's/\$$DATE\$$/'"$$(date '+%B %d, %Y')"/g \
-e 's/\$$MAN_CURL\$$/${MAN_CURL}/' \
-e 's/\$$MAN_DEBUG\$$/${MAN_DEBUG}/' \
+ -e 's/\$$MAN_EXIF\$$/${MAN_EXIF}/' \
-e 's/\$$MAN_XINERAMA\$$/${MAN_XINERAMA}/' \
< ${@:.1=.pre} > $@
diff --git a/man/feh.pre b/man/feh.pre
index 42c6caa..08a151f 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -25,7 +25,7 @@ $VERSION$
.Pp
.
Compile-time switches: libcurl support $MAN_CURL$, Xinerama support
-$MAN_XINERAMA$$MAN_DEBUG$
+$MAN_XINERAMA$, builtin EXIF support $MAN_EXIF$$MAN_DEBUG$
.
.
.Sh DESCRIPTION
diff --git a/src/options.c b/src/options.c
index 4c0ad5d..5f94a64 100644
--- a/src/options.c
+++ b/src/options.c
@@ -792,6 +792,10 @@ static void show_version(void)
"debug "
#endif
+#ifdef HAVE_LIBEXIF
+ "exif "
+#endif
+
#if _FILE_OFFSET_BITS == 64
"stat64 "
#endif