trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sor...@apache.org
Subject git commit: TS-2607: Fix TS_USE_HWLOC #define in build process
Date Mon, 03 Mar 2014 22:15:34 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master b74425c05 -> 3b3461edf


TS-2607: Fix TS_USE_HWLOC #define in build process


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3b3461ed
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3b3461ed
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3b3461ed

Branch: refs/heads/master
Commit: 3b3461edf835719e24d9cf2b2c74969d9a8ee012
Parents: b74425c
Author: Phil Sorber <sorber@apache.org>
Authored: Mon Mar 3 15:15:17 2014 -0700
Committer: Phil Sorber <sorber@apache.org>
Committed: Mon Mar 3 15:15:17 2014 -0700

----------------------------------------------------------------------
 CHANGES      | 2 ++
 configure.ac | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b3461ed/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 3b21433..c1b35dc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-2607] Fix TS_USE_HWLOC #define in build process
+
   *) [TS-2595] DNS lookup failed with multiple search domains. 
    Author: Thach Tran <tranngocthachs@gmail.com>
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b3461ed/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 169fa16..a9d9a34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1367,7 +1367,7 @@ AS_IF([test "x$enable_hwloc" = "xyes"], [
   )
 
   # Use pkg-config, because some distros (*cough* Ubuntu) put hwloc in unusual places.
-  PKG_CHECK_MODULES([hwloc], [hwloc], [use_hwloc=yes], [use_hwloc=no])
+  PKG_CHECK_MODULES([hwloc], [hwloc], [use_hwloc=1], [use_hwloc=0])
   AC_SUBST([hwloc_CFLAGS])
   AC_SUBST([hwloc_LIBS])
 ])


Mime
View raw message