[trafficserver] branch master updated: Build: Fix build problems on RHEL 6 for traffic_top.

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shinrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new cb82c8e  Build: Fix build problems on RHEL 6 for traffic_top.
cb82c8e is described below

commit cb82c8e5a6c77885e9c38f954c31a6d8db9748b1
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Wed Nov 22 12:53:10 2017 -0600

    Build: Fix build problems on RHEL 6 for traffic_top.
---
 cmd/traffic_top/Makefile.am |  1 +
 configure.ac                | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/cmd/traffic_top/Makefile.am b/cmd/traffic_top/Makefile.am
index f9079b1..03daddc 100644
--- a/cmd/traffic_top/Makefile.am
+++ b/cmd/traffic_top/Makefile.am
@@ -28,6 +28,7 @@ AM_CPPFLAGS += \
   @CURSES_CFLAGS@
 
 AM_LDFLAGS += \
+  @CURSES_LDFLAGS@ \
   @OPENSSL_LDFLAGS@
 
 bin_PROGRAMS = traffic_top
diff --git a/configure.ac b/configure.ac
index eff7c32..d7f1be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1104,8 +1104,20 @@ AC_CHECK_LIB([resolv],[__putlong],[AC_SUBST([LIBRESOLV],["-lresolv"])])
 # ncurses compile tests does not generate unused variable warnings.
 __saved_CFLAGS="$CFLAGS"
 TS_REMOVEFROM(CFLAGS, -Werror)
+
+dnl Red Hat 6 requires special flags for curses to work.
+if test -r /etc/system-release ; then
+  case `cat /etc/system-release` in
+    Red\ Hat*release\ 6.*)
+      TS_ADDTO(CFLAGS, [-Wl,--add-needed])
+      curses_ldflags="-Wl,--add-needed"
+    ;;
+  esac
+fi
+
 AX_WITH_CURSES
 CFLAGS="$__saved_CFLAGS"
+AC_SUBST([CURSES_LDFLAGS],[$curses_ldflags])
 
 #
 # Check for SSL presence and usability

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].