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