List additional features in usage message (-v)

3 files changed, 26 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 8cf5a9a..107d31c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = git-20110908
+VERSION = git-20110910
 
 CC      = gcc
 CFLAGS  = -Wall -pedantic -O2
diff --git a/README.md b/README.md
index 78d37aa..8d61e64 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@ Features
 * Basic support for multi-frame images
 * Display image information in window title
 
-Additional features, that need to be included at compile-time--see next section
-on how to enable them:
+Additional features, that need to be included at compile-time--see section
+*Installation* on how to enable them:
 
 * Play GIF animations
 * Auto-orientate JPEG images according to their EXIF tags
@@ -57,14 +57,13 @@ check and change them, so that they fit your needs.
 Additional features
 -------------------
 
-The XFLAGS and XLIBS macros/environment variables control which additional
-features (i.e. non-default compile-time features) should be enabled and
-included during compilation.
+The XFLAGS and XLIBS macros control which additional features (non-default
+compile-time features) should be enabled and included during compilation.
 
 The following table lists the available additional features--the column
 *Requires* indicates, which libraries need to be installed for a feature; the
-columns *XFLAGS* and *XLIBS* show, what needs to be added to these
-macros/environment variables to enable the corresponding feature:
+columns *XFLAGS* and *XLIBS* show, what needs to be added to these macros to
+enable the corresponding feature:
 
     Feature                           | Requires | XFLAGS         | XLIBS
     ----------------------------------+----------+----------------+--------
@@ -87,9 +86,9 @@ Or you need to run the following commands before building sxiv:
 
 Usage
 =====
-sxiv has two modes of operation: image and thumbnail mode. The default is image
-mode, in which only the current image is shown. In thumbnail mode a grid of
-small previews is displayed, making it easy to choose an image to open.
+sxiv has two modes of operation: image and thumbnail mode. The default is
+image mode, in which only the current image is shown. In thumbnail mode a grid
+of small previews is displayed, making it easy to choose an image to open.
 
 sxiv supports the following command-line options:
 
diff --git a/options.c b/options.c
index 853a72f..8532be1 100644
--- a/options.c
+++ b/options.c
@@ -33,11 +33,24 @@ options_t _options;
 const options_t *options = (const options_t*) &_options;
 
 void print_usage() {
-	printf("usage: sxiv [-cdFfhpqrstvZ] [-g GEOMETRY] [-n NUM] [-z ZOOM] FILES...\n");
+	printf("usage: sxiv [-cdFfhpqrstvZ] [-g GEOMETRY] [-n NUM] "
+	       "[-z ZOOM] FILES...\n");
 }
 
 void print_version() {
-	printf("sxiv %s - simple x image viewer\n", VERSION);
+	printf("sxiv %s - Simple X Image Viewer\n", VERSION);
+	printf("Additional features included (+) or not (-): %s, %s\n",
+#ifdef EXIF_SUPPORT
+	       "+exif",
+#else
+	       "-exif",
+#endif
+#ifdef GIF_SUPPORT
+	       "+gif"
+#else
+	       "-gif"
+#endif
+	      );
 }
 
 void parse_options(int argc, char **argv) {
@@ -119,9 +132,8 @@ void parse_options(int argc, char **argv) {
 					fprintf(stderr, "sxiv: invalid argument for option -z: %s\n",
 					        optarg);
 					exit(1);
-				} else {
-					_options.zoom = z / 100.0;
 				}
+				_options.zoom = z / 100.0;
 				break;
 		}
 	}