utils/screen/patches/010-fix-configure-failed-while-build-dir-name-contains-y.patch

   1 From 8c2b4061d16756ee2ed37f08db063b8215656943 Mon Sep 17 00:00:00 2001
   2 From: Hongxu Jia <hongxu.jia@windriver.com>
   3 Date: Thu, 2 Nov 2017 16:48:15 +0800
   4 Subject: [PATCH] fix configure failed while build dir name contains "yes"
   5
   6 While build dir name contained "yes", and compiled with
   7 producing debugging information (-g), the configure failed.
   8
   9 The pattern of AC_EGREP_CPP (string "yes") mismatched with
  10 dir name. It caused the test of AC_EGREP_CPP incorrect.
  11
  12 Use YES_IS_DEFINED to replace yes which is not often used
  13 as dir name.
  14
  15 Bug: 52329
  16 (Fix release v.4.6.2 or above)
  17
  18 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  19 ---
  20  configure.ac | 32 ++++++++++++++++----------------
  21  1 file changed, 16 insertions(+), 16 deletions(-)
  22
  23 diff --git a/src/configure.ac b/src/configure.ac
  24 index 28237f5..34f9735 100644
  25 --- a/configure.ac
  26 +++ b/configure.ac
  27 @@ -151,9 +151,9 @@ fi
  28
  29
  30  AC_CHECKING(for Ultrix)
  31 -AC_EGREP_CPP(yes,
  32 +AC_EGREP_CPP(YES_IS_DEFINED,
  33  [#if defined(ultrix) || defined(__ultrix)
  34 -   yes;
  35 +   YES_IS_DEFINED;
  36  #endif
  37  ], ULTRIX=1)
  38
  39 @@ -168,9 +168,9 @@ dnl ghazi@caip.rutgers.edu (Kaveh R. Ghazi):
  40  dnl BBN butterfly is not POSIX, but a MACH BSD system.
  41  dnl Do not define POSIX and TERMIO.
  42  AC_CHECKING(for butterfly)
  43 -AC_EGREP_CPP(yes,
  44 +AC_EGREP_CPP(YES_IS_DEFINED,
  45  [#if defined(butterfly)
  46 -  yes;
  47 +  YES_IS_DEFINED;
  48  #endif
  49  ], butterfly=1)
  50
  51 @@ -179,12 +179,12 @@ if test -n "$ULTRIX"; then
  52    test -z "$GCC" && CC="$CC -YBSD"
  53  fi
  54  AC_CHECKING(for POSIX.1)
  55 -AC_EGREP_CPP(yes,
  56 +AC_EGREP_CPP(YES_IS_DEFINED,
  57  [#include <sys/types.h>
  58  #include <unistd.h>
  59  main () {
  60  #ifdef _POSIX_VERSION
  61 -  yes;
  62 +  YES_IS_DEFINED;
  63  #endif
  64  ], AC_NOTE(- you have a POSIX system) AC_DEFINE(POSIX) posix=1)
  65  fi
  66 @@ -196,9 +196,9 @@ AC_TRY_COMPILE(
  67  #include <fcntl.h>], [int x = SIGCHLD | FNDELAY;], , AC_DEFINE(SYSV))
  68
  69  AC_CHECKING(for sequent/ptx)
  70 -AC_EGREP_CPP(yes,
  71 +AC_EGREP_CPP(YES_IS_DEFINED,
  72  [#ifdef _SEQUENT_
  73 -  yes;
  74 +  YES_IS_DEFINED;
  75  #endif
  76  ], LIBS="$LIBS -lsocket -linet";seqptx=1)
  77
  78 @@ -213,9 +213,9 @@ AC_TRY_LINK([#include <utmpx.h>
  79  AC_CHECK_HEADERS([stropts.h string.h strings.h])
  80
  81  AC_CHECKING(for Solaris 2.x)
  82 -AC_EGREP_CPP(yes,
  83 +AC_EGREP_CPP(YES_IS_DEFINED,
  84  [#if defined(SVR4) && defined(sun)
  85 -  yes
  86 +  YES_IS_DEFINED;
  87  #endif
  88  ], LIBS="$LIBS -lsocket -lnsl -lkstat")
  89
  90 @@ -699,9 +699,9 @@ else
  91  pdir='/dev'
  92  fi
  93  dnl SCO uses ptyp%d
  94 -AC_EGREP_CPP(yes,
  95 +AC_EGREP_CPP(YES_IS_DEFINED,
  96  [#ifdef M_UNIX
  97 -   yes;
  98 +   YES_IS_DEFINED;
  99  #endif
 100  ], ptys=`echo /dev/ptyp??`, ptys=`echo $pdir/pty??`)
 101  dnl if test -c /dev/ptyp19; then
 102 @@ -878,9 +878,9 @@ fi
 103  )
 104
 105  if test -z "$load" ; then
 106 -AC_EGREP_CPP(yes,
 107 +AC_EGREP_CPP(YES_IS_DEFINED,
 108  [#if defined(NeXT) || defined(apollo) || defined(linux)
 109 -  yes;
 110 +  YES_IS_DEFINED;
 111  #endif
 112  ], load=1)
 113  fi
 114 @@ -1105,9 +1105,9 @@ AC_CHECKING(syslog in libbsd.a)
 115  AC_TRY_LINK(, [closelog();], AC_NOTE(- found.), [LIBS="$oldlibs"
 116  AC_NOTE(- bad news: syslog missing.) AC_DEFINE(NOSYSLOG)])])
 117
 118 -AC_EGREP_CPP(yes,
 119 +AC_EGREP_CPP(YES_IS_DEFINED,
 120  [#ifdef M_UNIX
 121 -   yes;
 122 +   YES_IS_DEFINED;
 123  #endif
 124  ], LIBS="$LIBS -lsocket -lcrypt_i")
 125
 126 --
 127 2.17.1
 128