diff options
| author | Zandra Hird <[email protected]> | 2015-05-05 14:20:44 +0200 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-05-05 14:20:44 +0200 |
| commit | 01f44008ec5a3dc02e803f22564c8184a9745d69 (patch) | |
| tree | 1434af650d990d7b1cdb85a647c59ab3c5bcfd51 | |
| parent | c989f00ad04e5c38c1a947e37f61f478d0633e4a (diff) | |
| parent | 871770f169f6a9a996d22cbd63128c53b7b4370c (diff) | |
| download | otp-01f44008ec5a3dc02e803f22564c8184a9745d69.tar.gz otp-01f44008ec5a3dc02e803f22564c8184a9745d69.tar.bz2 otp-01f44008ec5a3dc02e803f22564c8184a9745d69.zip | |
Merge branch 'joudinet/fix-ac-egrep-cpp-usage'
* joudinet/fix-ac-egrep-cpp-usage:
erts: Fix incorrect use of AC_EGREP_CPP
OTP-12706
| -rw-r--r-- | erts/aclocal.m4 | 2 | ||||
| -rw-r--r-- | erts/configure.in | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index 83f735d332..73fa5d3603 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -559,7 +559,7 @@ dnl AC_DEFUN(LM_SYS_MULTICAST, [AC_CACHE_CHECK([for multicast support], ac_cv_sys_multicast_support, -[AC_EGREP_CPP(yes, +[AC_EGREP_CPP(^yes$, [#include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> diff --git a/erts/configure.in b/erts/configure.in index 873e1e30fe..2d234e5f66 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -1558,10 +1558,11 @@ if test "$have_gethostbyname_r" = yes; then [Define to flavour of gethostbyname_r])) ;; *) - AC_EGREP_CPP(yes,[#include <stdio.h> - #ifdef __GLIBC__ - yes - #endif + AC_EGREP_CPP(^yes$,[ +#include <stdio.h> +#ifdef __GLIBC__ +yes +#endif ], AC_DEFINE(HAVE_GETHOSTBYNAME_R, GHBN_R_GLIBC, [Define to flavour of gethostbyname_r])) ;; @@ -4293,10 +4294,10 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in SSL_INCLUDE="-I$dir/include" old_CPPFLAGS=$CPPFLAGS CPPFLAGS=$SSL_INCLUDE - AC_EGREP_CPP(yes,[ + AC_EGREP_CPP(^yes$,[ #include <openssl/opensslv.h> #if OPENSSL_VERSION_NUMBER >= 0x0090700fL - yes +yes #endif ],[ ssl_found=yes @@ -4491,10 +4492,10 @@ if test "x$SSL_APP" != "x" ; then AC_MSG_CHECKING(for OpenSSL kerberos 5 support) old_CPPFLAGS=$CPPFLAGS CPPFLAGS=$SSL_INCLUDE - AC_EGREP_CPP(yes,[ + AC_EGREP_CPP(^yes$,[ #include <openssl/opensslconf.h> #ifndef OPENSSL_NO_KRB5 - yes +yes #endif ],[ AC_MSG_RESULT([yes]) |