| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 4b258c5a9078f8df60684ab7536ce3a8ff207e08 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Thu, 12 Oct 2017 10:03:57 +0000 |
| 4 | Subject: [PATCH] configure.ac: fix configure failed while build dir contains "yes" |
| 5 | |
| 6 | While the name of build dir contains "yes", the AC_EGREP_CPP |
| 7 | test always return true. |
| 8 | |
| 9 | We rarely use "yes;" to name build dir, so s/yes/yes;/g |
| 10 | could fix the issue |
| 11 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 12 | Upstream-Status: Accepted |
| 13 | https://git.savannah.gnu.org/cgit/screen.git/commit/?h=screen-v4&id=8c2b4061d16756ee2ed37f08db063b8215656943 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 14 | |
| 15 | Signed-off-by: Jian Kang <jian.kang@windriver.com> |
| 16 | --- |
| 17 | configure.ac | 20 ++++++++++---------- |
| 18 | 1 file changed, 10 insertions(+), 10 deletions(-) |
| 19 | |
| 20 | diff --git a/configure.ac b/configure.ac |
| 21 | index 12996cd..4765af6 100644 |
| 22 | --- a/configure.ac |
| 23 | +++ b/configure.ac |
| 24 | @@ -128,7 +128,7 @@ fi |
| 25 | |
| 26 | |
| 27 | AC_CHECKING(for Ultrix) |
| 28 | -AC_EGREP_CPP(yes, |
| 29 | +AC_EGREP_CPP(yes;, |
| 30 | [#if defined(ultrix) || defined(__ultrix) |
| 31 | yes; |
| 32 | #endif |
| 33 | @@ -145,7 +145,7 @@ dnl ghazi@caip.rutgers.edu (Kaveh R. Ghazi): |
| 34 | dnl BBN butterfly is not POSIX, but a MACH BSD system. |
| 35 | dnl Do not define POSIX and TERMIO. |
| 36 | AC_CHECKING(for butterfly) |
| 37 | -AC_EGREP_CPP(yes, |
| 38 | +AC_EGREP_CPP(yes;, |
| 39 | [#if defined(butterfly) |
| 40 | yes; |
| 41 | #endif |
| 42 | @@ -156,7 +156,7 @@ if test -n "$ULTRIX"; then |
| 43 | test -z "$GCC" && CC="$CC -YBSD" |
| 44 | fi |
| 45 | AC_CHECKING(for POSIX.1) |
| 46 | -AC_EGREP_CPP(yes, |
| 47 | +AC_EGREP_CPP(yes;, |
| 48 | [#include <sys/types.h> |
| 49 | #include <unistd.h> |
| 50 | main () { |
| 51 | @@ -173,14 +173,14 @@ AC_TRY_COMPILE( |
| 52 | #include <fcntl.h>], [int x = SIGCHLD | FNDELAY;], , AC_DEFINE(SYSV)) |
| 53 | |
| 54 | AC_CHECKING(for sequent/ptx) |
| 55 | -AC_EGREP_CPP(yes, |
| 56 | +AC_EGREP_CPP(yes;, |
| 57 | [#ifdef _SEQUENT_ |
| 58 | yes; |
| 59 | #endif |
| 60 | ], LIBS="$LIBS -lsocket -linet";seqptx=1) |
| 61 | |
| 62 | AC_CHECKING(SVR4) |
| 63 | -AC_EGREP_CPP(yes, |
| 64 | +AC_EGREP_CPP(yes;, |
| 65 | [main () { |
| 66 | #if defined(SVR4) || defined(__SVR4) |
| 67 | yes; |
| 68 | @@ -200,9 +200,9 @@ fi |
| 69 | AC_CHECK_HEADERS([stropts.h string.h strings.h]) |
| 70 | |
| 71 | AC_CHECKING(for Solaris 2.x) |
| 72 | -AC_EGREP_CPP(yes, |
| 73 | +AC_EGREP_CPP(yes;, |
| 74 | [#if defined(SVR4) && defined(sun) |
| 75 | - yes |
| 76 | + yes; |
| 77 | #endif |
| 78 | ], LIBS="$LIBS -lsocket -lnsl -lkstat") |
| 79 | |
| 80 | @@ -697,7 +697,7 @@ else |
| 81 | pdir='/dev' |
| 82 | fi |
| 83 | dnl SCO uses ptyp%d |
| 84 | -AC_EGREP_CPP(yes, |
| 85 | +AC_EGREP_CPP(yes;, |
| 86 | [#ifdef M_UNIX |
| 87 | yes; |
| 88 | #endif |
| 89 | @@ -880,7 +880,7 @@ fi |
| 90 | ) |
| 91 | |
| 92 | if test -z "$load" ; then |
| 93 | -AC_EGREP_CPP(yes, |
| 94 | +AC_EGREP_CPP(yes;, |
| 95 | [#if defined(NeXT) || defined(apollo) || defined(linux) |
| 96 | yes; |
| 97 | #endif |
| 98 | @@ -1112,7 +1112,7 @@ AC_CHECKING(syslog in libbsd.a) |
| 99 | AC_TRY_LINK(, [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs" |
| 100 | AC_NOTE(- bad news: syslog missing.) AC_DEFINE(NOSYSLOG)])]) |
| 101 | |
| 102 | -AC_EGREP_CPP(yes, |
| 103 | +AC_EGREP_CPP(yes;, |
| 104 | [#ifdef M_UNIX |
| 105 | yes; |
| 106 | #endif |
| 107 | -- |
| 108 | 2.13.3 |
| 109 | |