Commit fb698401 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge branch 'swillner-master'

parents e6dd09e6 1413ec25

.travis.yml

+1 −0
Original line number Diff line number Diff line
@@ -27,3 +27,4 @@ env: 
  - stat64=1

  - verscmp=0

  - xinerama=0

  - inotify=1

README.md

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ indicates that the corresponding feature is enabled by default. 
| debug | 0 | debug build, enables `--debug` |

| exif | 0 | Builtin EXIF tag display support |

| 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 |

| verscmp | 1 | Support naturing sorting (`--version-sort`). Requires a GNU-compatible libc exposing `strverscmp` |

| xinerama | 1 | Support Xinerama/XRandR multiscreen setups |

config.mk

+7 −0
Original line number Diff line number Diff line
@@ -86,6 +86,13 @@ else 
	MAN_EXIF = disabled

endif



ifeq (${inotify},1)

	CFLAGS += -DHAVE_INOTIFY

	MAN_INOTIFY = enabled

else

	MAN_INOTIFY = disabled

endif



MAN_DATE ?= ${shell date '+%B %d, %Y'}



# Uncomment this to use dmalloc

man/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ all: ${TARGETS} 
	-e 's/\$$MAN_CURL\$$/${MAN_CURL}/' \

	-e 's/\$$MAN_DEBUG\$$/${MAN_DEBUG}/' \

	-e 's/\$$MAN_EXIF\$$/${MAN_EXIF}/' \

	-e 's/\$$MAN_INOTIFY\$$/${MAN_INOTIFY}/' \

	-e 's/\$$MAN_VERSCMP\$$/${MAN_VERSCMP}/' \

	-e 's/\$$MAN_XINERAMA\$$/${MAN_XINERAMA}/' \

	< ${@:.1=.pre} > $@

man/feh.pre

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ $VERSION$ 
.

Compile-time switches: libcurl support $MAN_CURL$, natural sorting support

$MAN_VERSCMP$, Xinerama support

$MAN_XINERAMA$, builtin EXIF support $MAN_EXIF$$MAN_DEBUG$

$MAN_XINERAMA$, builtin EXIF support $MAN_EXIF$, inotify support

$MAN_INOTIFY$$MAN_DEBUG$

.

.

.Sh DESCRIPTION