1From c3058f9eadaf5ff28ba776cfed54b609a93a1249 Mon Sep 17 00:00:00 2001
2From: Herrie <github.com@herrie.org>
3Date: Mon, 24 Jul 2017 21:30:16 +0200
4
5---
6Upstream-Status: Pending
7
8 configure.ac | 10 +---------
9 1 file changed, 1 insertion(+), 9 deletions(-)
10
11diff --git a/configure.ac b/configure.ac
12index b8acd2a..d20a18e 100644
13--- a/configure.ac
14+++ b/configure.ac
15@@ -642,7 +642,7 @@ if test "x$enable_consoleui" = "xyes"; then
16 	if test "x$enable_consoleui" = "xyes"; then
17 		dnl # Some distros put the headers in ncursesw/, some don't
18 		found_ncurses_h=no
19-		for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include
20+		for location in $ac_ncurses_includes $NCURSES_HEADERS
21 		do
22 			f="$location/ncurses.h"
23 			orig_CFLAGS="$CFLAGS"
24@@ -2397,10 +2397,6 @@ if test "$kerberos" != "no" ; then
25 			KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV"
26 		fi
27 		KRB4_LDFLAGS="-L${kerberos}/lib"
28-	elif test -d /usr/local/include/kerberosIV ; then
29-		KRB4_CFLAGS="-I/usr/local/include/kerberosIV"
30-	elif test -d /usr/include/kerberosIV ; then
31-		KRB4_CFLAGS="-I/usr/include/kerberosIV"
32 	fi
33 	AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.])
34
35@@ -2433,10 +2429,6 @@ if test "$zephyr" != "no" ; then
36 		ZEPHYR_LDFLAGS="-L${zephyr}/lib"
37 	elif test -d /usr/athena/include/zephyr ; then
38 		ZEPHYR_CFLAGS="-I/usr/athena/include"
39-	elif test -d /usr/include/zephyr ; then
40-		ZEPHYR_CFLAGS="-I/usr/include"
41-	elif test -d /usr/local/include/zephyr ; then
42-		ZEPHYR_CFLAGS="-I/usr/local/include"
43 	fi
44 	AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.])
45 	AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno")
46