Commit 858fefb5 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Do not include help text by default

parent 753fc6ef

ChangeLog

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ git HEAD 
      <https://github.com/derf/feh/pull/20>

    * Show certain warnings in the image window as well as on the commandline

      <http://github.com/derf/feh/issues/43>

    * Since the manual is way better structured and more detailed than the

      --help output, it now simply refers to the manual. To include the old

      help text, build feh with 'help=1'



Sat, 23 Apr 2011 22:00:27 +0200  Daniel Friesel <derf@finalrewind.org>

README

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ Available flags are: 


 * curl     (default 1) - use libcurl to view http:// and similar images

 * debug    (default 0) - debug build, enables --debug

 * help     (default 0) - include help text (refers to the manpage otherwise)

 * xinerama (default 1) - Support Xinerama multiscreen setups



So, by default libcurl and Xinerama are enabled, while debug is disabled.

config.mk

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ CFLAGS += -Wall -Wextra -pedantic 


curl ?= 1

debug ?= 0

help ?= 0

xinerama ?= 1



ifeq (${curl},1)
@@ -36,6 +37,10 @@ else 
	MAN_DEBUG =

endif



ifeq (${help},1)

	CFLAGS += -DINCLUDE_HELP

endif



ifeq (${xinerama},1)

	CFLAGS += -DHAVE_LIBXINERAMA

	LDLIBS += -lXinerama

src/options.c

+4 −0
Original line number Diff line number Diff line
@@ -882,7 +882,11 @@ void show_mini_usage(void) 
static void show_usage(void)

{

	fputs(

#ifdef INCLUDE_HELP

#include "help.inc"

#else

	"See 'man " PACKAGE "'\n"

#endif

	, stdout);

	exit(0);

}