trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1058844 - in /trafficserver/traffic/trunk: configure.ac proxy/mgmt/Makefile.am
Date Fri, 14 Jan 2011 03:03:49 GMT
Author: amc
Date: Fri Jan 14 03:03:48 2011
New Revision: 1058844

URL: http://svn.apache.org/viewvc?rev=1058844&view=rev
Log:
A bit of configure.ac cleanup, and a fix for WCCP building.

Modified:
    trafficserver/traffic/trunk/configure.ac
    trafficserver/traffic/trunk/proxy/mgmt/Makefile.am

Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1058844&r1=1058843&r2=1058844&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Fri Jan 14 03:03:48 2011
@@ -212,9 +212,9 @@ AC_ARG_ENABLE([micro],
   [],
   [enable_micro=no]
 )
+AC_MSG_RESULT([$enable_micro])
 AS_IF([test "x$enable_micro" = "xyes"], [is_micro_build=1], [is_micro_build=0])
 AC_SUBST(is_micro_build)
-AC_MSG_RESULT([$enable_micro])
 
 #
 # Standalone iocore
@@ -262,8 +262,8 @@ AC_ARG_ENABLE([webui],
   [],
   [enable_webui=no]
 )
-TS_ARG_ENABLE_VAR([has],[webui])
 AC_MSG_RESULT([$enable_webui])
+TS_ARG_ENABLE_VAR([has],[webui])
 AC_SUBST(has_webui)
 AM_CONDITIONAL([BUILD_WEBUI], [test 0 -ne $has_webui])
 
@@ -292,7 +292,7 @@ AC_ARG_ENABLE([detailed-log],
 AC_MSG_RESULT([$enable_detailed_log])
 TS_ARG_ENABLE_VAR([has],[detailed-log])
 AC_SUBST(has_detailed_log)
-AM_CONDITIONAL([BUILD_DETAILED_LOG], [test "x$enable_detailed_log" = "xyes"])
+AM_CONDITIONAL([BUILD_DETAILED_LOG], [test 0 -ne $has_detailed_log])
 
 #
 # Cli2
@@ -305,7 +305,7 @@ AC_ARG_ENABLE([cli2],
 )
 AC_MSG_RESULT([$enable_cli2])
 TS_ARG_ENABLE_VAR([has],[cli2])
-AS_IF([test $has_cli2],
+AS_IF([test 0 -ne $has_cli2],
   [AC_SUBST([CLI_DIR],[cli2])]
 )
 AC_SUBST(has_cli2)

Modified: trafficserver/traffic/trunk/proxy/mgmt/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/Makefile.am?rev=1058844&r1=1058843&r2=1058844&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/Makefile.am Fri Jan 14 03:03:48 2011
@@ -56,6 +56,7 @@ libmgmt_p_a_CPPFLAGS = \
   -I$(top_srcdir)/proxy/mgmt/cluster \
   -I$(top_srcdir)/proxy/mgmt/preparse \
   -I$(top_srcdir)/proxy/mgmt/utils \
+  -I$(top_srcdir)/lib/tsconfig \
   -I$(top_srcdir)/proxy/mgmt/web2 \
   -I$(top_srcdir)/proxy
 libmgmt_p_a_SOURCES = \



Mime
View raw message