From d028190d036f25472dba587863322a8fe03dda95 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun, 21 Apr 2013 15:02:52 -0700
Subject: Mark usage() functions as noreturn, as suggested by gcc

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 atobm.c      | 3 ++-
 bmtoa.c      | 2 +-
 configure.ac | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/atobm.c b/atobm.c
index 93d7b12..040fecb 100644
--- a/atobm.c
+++ b/atobm.c
@@ -34,6 +34,7 @@ from The Open Group.
 #include <stdio.h>
 #include <ctype.h>
 #include <X11/Xos.h>
+#include <X11/Xfuncproto.h>
 #include <stdlib.h>
 
 static char *ProgramName;
@@ -41,7 +42,7 @@ static char *ProgramName;
 static void doit(FILE *fp, const char *filename, const char *chars,
 		 int xhot, int yhot, const char *name);
 
-static void
+static void _X_NORETURN
 usage (void)
 {
     fprintf (stderr, "usage:  %s [-options ...] [filename]\n\n%s\n",
diff --git a/bmtoa.c b/bmtoa.c
index 6682fe8..0394038 100644
--- a/bmtoa.c
+++ b/bmtoa.c
@@ -53,7 +53,7 @@ static char *ProgramName;
 static void print_scanline (unsigned int width, unsigned int height,
 			    unsigned const char *data, const char *chars);
 
-static void
+static void _X_NORETURN
 usage (void)
 {
     fprintf (stderr, "usage:  %s [-options ...] [filename]\n\n%s\n",
diff --git a/configure.ac b/configure.ac
index e9b4699..394fbdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,8 +55,8 @@ LIBS="$save_LIBS"
 AC_SUBST([MATH_LIBS])
 
 # Obtain compiler/linker options from dependencies
-PKG_CHECK_MODULES(BMTOA, x11 xmu)
-PKG_CHECK_MODULES(ATOBM, xproto)
+PKG_CHECK_MODULES(BMTOA, [x11 xmu xproto >= 7.0.17])
+PKG_CHECK_MODULES(ATOBM, [xproto >= 7.0.17])
 PKG_CHECK_MODULES(BITMAP, xbitmaps xaw7 xmu)
 
 PKG_CHECK_MODULES(APPDEFS, xt)
-- 
cgit v1.2.3