You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/23 16:03:50 UTC
svn commit: r947417 - in /trafficserver/traffic/trunk: ./ build/
iocore/cache/ libinktomi++/ proxy/logging/ proxy/mgmt2/tools/
proxy/mgmt2/utils/
Author: mturk
Date: Sun May 23 14:03:49 2010
New Revision: 947417
URL: http://svn.apache.org/viewvc?rev=947417&view=rev
Log:
TS-366: Revert using #if ATS_HAVE_FOO_H for system include files
Modified:
trafficserver/traffic/trunk/build/dbd.m4
trafficserver/traffic/trunk/build/lzma.m4
trafficserver/traffic/trunk/build/zlib.m4
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/iocore/cache/RamCacheCLFUS.cc
trafficserver/traffic/trunk/libinktomi++/SimpleDBM.h
trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
trafficserver/traffic/trunk/libinktomi++/ink_platform.h
trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc
trafficserver/traffic/trunk/libinktomi++/inktomi++.h
trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc
trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc
Modified: trafficserver/traffic/trunk/build/dbd.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/dbd.m4?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/dbd.m4 (original)
+++ trafficserver/traffic/trunk/build/dbd.m4 Sun May 23 14:03:49 2010
@@ -177,7 +177,6 @@ if test "$enable_libdb" != "no"; then
ATS_FLAG_HEADERS(db_185.h db.h, [libdb_have_headers=1])
fi
if test "$libdb_have_headers" != "0"; then
- AC_DEFINE(HAVE_LIBDB,1,[Compiling with Berkeley-DB support])
AC_SUBST([LIBDB], ["-ldb"])
else
enable_libdb=no
Modified: trafficserver/traffic/trunk/build/lzma.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/lzma.m4?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/lzma.m4 (original)
+++ trafficserver/traffic/trunk/build/lzma.m4 Sun May 23 14:03:49 2010
@@ -93,7 +93,6 @@ if test "$enable_lzma" != "no"; then
ATS_FLAG_HEADERS(lzma.h, [lzma_have_headers=1])
fi
if test "$lzma_have_headers" != "0"; then
- AC_DEFINE(HAVE_LZMA,1,[Compiling with LZMA support])
ATS_ADDTO(LIBS, [-llzma])
else
enable_lzma=no
Modified: trafficserver/traffic/trunk/build/zlib.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/zlib.m4?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/zlib.m4 (original)
+++ trafficserver/traffic/trunk/build/zlib.m4 Sun May 23 14:03:49 2010
@@ -93,7 +93,6 @@ if test "$enable_zlib" != "no"; then
ATS_FLAG_HEADERS(zlib.h, [zlib_have_headers=1])
fi
if test "$zlib_have_headers" != "0"; then
- AC_DEFINE(HAVE_LIBZ,1,[Compiling with ZLIB support])
ATS_ADDTO(LIBS, [-lz])
else
enable_zlib=no
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Sun May 23 14:03:49 2010
@@ -66,6 +66,18 @@ AC_SUBST(ATS_VERSION_MAJOR)
AC_SUBST(ATS_VERSION_MINOR)
AC_SUBST(ATS_VERSION_MICRO)
+dnl Hard-coded top of ink_autoconf.h:
+AH_TOP([
+#ifndef _ink_autoconf_h
+#define _ink_autoconf_h
+])
+
+dnl Hard-coded inclusion at the tail end of ink_autoconf.h:
+AH_BOTTOM([
+
+#endif /* _ink_autoconf_h */
+])
+
#
# Generate ./config.nice for reproducing runs of configure
#
@@ -150,17 +162,15 @@ AC_SUBST(use_diags)
#
# Purify
#
-
+has_purify=0
AC_MSG_CHECKING([whether to enable purify])
AC_ARG_ENABLE([purify],
[AS_HELP_STRING([--enable-purify],[enable support for Purify])],
- [],
+ [has_purify=1],
[enable_purify=no]
)
AC_MSG_RESULT([$enable_purify])
-AS_IF([test "x$enable_purify" = "xyes"],
- [AC_DEFINE([PURIFY])]
-)
+AC_SUBST(has_purify)
#
# libev
@@ -178,45 +188,28 @@ AC_MSG_RESULT([$enable_libev])
#
# Micro
#
-
+is_micro_build=0
AC_MSG_CHECKING([whether to enable micro-TS])
AC_ARG_ENABLE([micro],
[AS_HELP_STRING([--enable-micro],[enable micro-TS build])],
- [],
+ [is_micro_build=1],
[enable_micro=no]
)
+AC_SUBST(is_micro_build)
AC_MSG_RESULT([$enable_micro])
-AS_IF([test "x$enable_micro" = "xyes"],
- [AC_DEFINE(TS_MICRO)
- AC_DEFINE(INK_NO_ACL)
- AC_DEFINE(INK_NO_CLUSTER)
- AC_DEFINE(INK_NO_DIAGS)
- AC_DEFINE(INK_NO_HOSTDB)
- AC_DEFINE(INK_NO_ICP)
- AC_DEFINE(INK_NO_LOG)
- AC_DEFINE(INK_NO_REMAP)
- AC_DEFINE(INK_NO_REVERSE)
- AC_DEFINE(INK_NO_SOCKS)
- AC_DEFINE(INK_NO_STAT_PAGES)
- AC_DEFINE(INK_NO_TESTS)
- AC_DEFINE(INK_USE_MUTEX_FOR_ATOMICLISTS)
- AC_DEFINE(INK_USE_MUTEX_FOR_FREELISTS)
- AC_DEFINE(USE_MD5_FOR_MMH)
- AC_DEFINE(_NO_FREELIST)
- ]
-)
#
# Standalone iocore
#
-
+has_standalone_iocore=0
AC_MSG_CHECKING([whether to build a standalone iocore])
AC_ARG_ENABLE([standalone-iocore],
[AS_HELP_STRING([--enable-standalone-iocore],[build just standalone iocore])],
- [],
+ [has_standalone_iocore=1],
[enable_standalone_iocore=no]
)
AC_MSG_RESULT([$enable_standalone_iocore])
+AC_SUBST(has_standalone_iocore)
AS_IF([test "x$enable_standalone_iocore" = "xyes"],
[AC_SUBST([IOCORE_MODULARIZED_DEFS],[""])
AC_SUBST([ink_with_modules_def],["-DREC_BUILD_STAND_ALONE"])
@@ -224,16 +217,11 @@ AS_IF([test "x$enable_standalone_iocore"
AC_SUBST([ink_with_modules_process],[""])
AC_SUBST([hdr_dirs],"proxy/hdrs")
],
- [AC_DEFINE([FIXME_NONMODULAR])
- AC_DEFINE([SPLIT_DNS])
- AC_DEFINE([NON_MODULAR])
- AC_DEFINE([HTTP_CACHE])
- AC_SUBST([ink_with_modules_def],["-DREC_BUILD_MGMT2"])
+ [AC_SUBST([ink_with_modules_def],["-DREC_BUILD_MGMT2"])
AC_SUBST([ink_with_modules_local],["-DLOCAL_MANAGER"])
AC_SUBST([ink_with_modules_process],["-DPROCESS_MANAGER"])
]
)
-AC_DEFINE([MODULARIZED])
AM_CONDITIONAL([STANDALONE_IOCORE], [test "x$enable_standalone_iocore" = "xyes"])
#
@@ -252,49 +240,44 @@ AC_SUBST([enable_remote_cov_commit])
#
# WebUI
#
+has_webui=0
AC_MSG_CHECKING([whether to enable Web UI])
AC_ARG_ENABLE([webui],
[AS_HELP_STRING([--enable-webui],[enable Web UI])],
- [],
+ [has_webui=1],
[enable_webui=no]
)
AC_MSG_RESULT([$enable_webui])
-AS_IF([test "x$enable_webui" = "xno"],
- [AC_DEFINE([NO_WEBUI],1,[disable Web UI])]
-)
+AC_SUBST(has_webui)
#
# API
#
-
+has_inkapi=1
AC_MSG_CHECKING([whether to enable API and plugin support])
AC_ARG_ENABLE([api],
[AS_HELP_STRING([--disable-api],[do not enable API and plugin support])],
- [],
+ [has_inkapi=0],
[enable_api=yes]
)
AC_MSG_RESULT([$enable_api])
-AS_IF([test "x$enable_api" = "xno"],
- [AC_DEFINE([INK_NO_TRANSFORM])
- AC_DEFINE([INK_NO_API])
- AC_DEFINE([INK_SINGLE_THREADED])
- ]
-)
+AC_SUBST(has_inkapi)
#
# Cli2
#
-
+has_cli2=1
AC_MSG_CHECKING([whether to enable cli2])
AC_ARG_ENABLE([cli2],
[AS_HELP_STRING([--disable-cli2],[do not compile cli2])],
- [],
+ [has_cli2=0],
[enable_cli2=yes]
)
AC_MSG_RESULT([$enable_cli2])
AS_IF([test "x$enable_cli2" = "xyes"],
[AC_SUBST([CLI_DIR],[cli2])]
)
+AC_SUBST(has_cli2)
# Google profiler
AC_MSG_CHECKING([whether to enable profiler])
@@ -382,6 +365,12 @@ if test "x${CCACHE}" = "xccache" ;then
CC="$CCACHE $CC"
CXX="$CCACHE $CXX"
fi
+dnl AC_PROG_SED is only avaliable in recent autoconf versions.
+dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present.
+ifdef([AC_PROG_SED],
+ [AC_PROG_SED],
+ [AC_CHECK_PROG(SED, sed, sed)])
+
AC_PROG_CPP
AC_PROG_CXXCPP
AM_PROG_AS
@@ -389,6 +378,10 @@ AC_PROG_AWK
AC_PROG_LN_S
AC_PROG_INSTALL
AC_PROG_LIBTOOL
+AC_CHECK_PROG(RM, rm, rm)
+AC_CHECK_PROG(ASCPP, cpp, cpp)
+AC_CHECK_TOOL(AR, ar, ar)
+AC_ISC_POSIX
AC_PATH_PROG([DOXYGEN], [doxygen]) # needed for Doxygen
AC_PATH_PROG([PERL],[perl],[not found])
@@ -668,19 +661,19 @@ fi
#
# Check for default sqlite3 DB backend
#
-sqlite3h=0
-db_185h=0
-dbh=0
+use_sqlite3=1
+use_libdb=0
ATS_CHECK_SQLITE3
if test "x${enable_sqlite3}" != "xyes"; then
ATS_CHECK_BDB
if test "x${enable_libdb}" != "xyes"; then
AC_MSG_ERROR([Need at least one DB backend, --with-sqlite3 and --with-libdb are supported])
fi
+ use_sqlite3=0
+ use_libdb=1
fi
-AC_SUBST(sqlite3h)
-AC_SUBST(db_185h)
-AC_SUBST(dbh)
+AC_SUBST(use_sqlite3)
+AC_SUBST(use_libdb)
ATS_FLAG_FUNCS([clock_gettime kqueue epoll_ctl posix_memalign posix_fadvise lrand48_r srand48_r port_create])
ATS_FLAG_FUNCS([strndup])
@@ -760,6 +753,7 @@ if test "x${with_profiler}" = "xyes"; th
fi
AC_SUBST(has_profiler)
+has_demangle=0
# For SunPro 5.2 - we need the demangle symbol for
# ink_stack_trace.cc in libinktomi++. Because this
# library is part of the SunPro distribution, we need
@@ -768,12 +762,12 @@ AC_SUBST(has_profiler)
AC_LANG_PUSH([C++])
AC_CHECK_LIB([demangle],[cplus_demangle],
[LIBDEMANGLE="-ldemangle"
- AC_DEFINE([HAVE_DEMANGLE])
+ has_demangle=1
]
)
AC_SUBST([LIBDEMANGLE])
AC_LANG_POP
-
+AC_SUBST(has_demangle)
need_union_semun=0
# It's stupid, but not all platforms have union semun, even those that need it.
@@ -1044,33 +1038,4 @@ AC_CONFIG_FILES([example/app-template/re
# -----------------------------------------------------------------------------
# 7. autoheader TEMPLATES
-AH_TEMPLATE([HAVE_DEMANGLE],[Compiling with demangle support.])
-AH_TEMPLATE([HTTP_CACHE],[Compiling with HTTP cache support.])
-AH_TEMPLATE([INKDISKAIO],[Define to 1 if Disk AIO is supported.])
-AH_TEMPLATE([INK_NO_ACL],[Disable ACL support.])
-AH_TEMPLATE([INK_NO_API],[Disable API support.])
-AH_TEMPLATE([INK_NO_CLUSTER],[Disable clustering support.])
-AH_TEMPLATE([INK_NO_DIAGS],[Disable diagnostic support.])
-AH_TEMPLATE([INK_NO_HOSTDB],[Disable host DB.])
-AH_TEMPLATE([INK_NO_ICP],[Disable ICP.])
-AH_TEMPLATE([INK_NO_LOG],[Disable logging.])
-AH_TEMPLATE([INK_NO_REMAP],[Disable remapping.])
-AH_TEMPLATE([INK_NO_REVERSE],[Disable reverse proxy.])
-AH_TEMPLATE([INK_NO_SOCKS],[Disable socks protocol.])
-AH_TEMPLATE([INK_NO_STAT_PAGES],[Disable status pages.])
-AH_TEMPLATE([INK_NO_TESTS],[Disable test.])
-AH_TEMPLATE([INK_NO_TRANSFORM],[Disable transformation support.])
-AH_TEMPLATE([INK_SINGLE_THREADED],[Disable threading])
-AH_TEMPLATE([INK_USE_MUTEX_FOR_ATOMICLISTS],[Use mutex for atomic lists.])
-AH_TEMPLATE([INK_USE_MUTEX_FOR_FREELISTS],[Use mutex for free lists.])
-AH_TEMPLATE([MODULARIZED],[Build modularized Trafficserver.])
-AH_TEMPLATE([PURIFY],[Define to 1 if support for Purify was enabled.])
-AH_TEMPLATE([TS_MICRO],[Define to 1 if building 'micro' Trafficserver distribution.])
-AH_TEMPLATE([USE_MD5_FOR_MMH],[Use MD5 for MMH])
-AH_TEMPLATE([_NO_FREELIST],[Disable free list support.])
-AH_TEMPLATE([FIXME_NONMODULAR],[FIXME_NONMODULAR])
-AH_TEMPLATE([SPLIT_DNS],[Compile with 'split' DNS support.])
-AH_TEMPLATE([NON_MODULAR],[Compile without modular support.])
-
AC_OUTPUT
-
Modified: trafficserver/traffic/trunk/iocore/cache/RamCacheCLFUS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/RamCacheCLFUS.cc?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/RamCacheCLFUS.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/RamCacheCLFUS.cc Sun May 23 14:03:49 2010
@@ -25,10 +25,10 @@
// See https://cwiki.apache.org/confluence/display/TS/RamCache
#include "P_Cache.h"
-#if ATS_HAVE_ZLIB_H
+#if ATS_HAS_LIBZ
#include <zlib.h>
#endif
-#if ATS_HAVE_LZMA_H
+#if ATS_HAS_LZMA
#include <lzma.h>
#endif
@@ -175,7 +175,7 @@ int RamCacheCLFUS::get(INK_MD5 *key, Ptr
goto Lfailed;
break;
}
-#if ATS_HAVE_ZLIB_H
+#if ATS_HAS_LIBZ
case CACHE_COMPRESSION_LIBZ: {
uLongf l = e->len;
if (Z_OK != uncompress((Bytef*)b, &l, (Bytef*)e->data->data(), e->compressed_len))
@@ -183,7 +183,7 @@ int RamCacheCLFUS::get(INK_MD5 *key, Ptr
break;
}
#endif
-#if ATS_HAVE_LZMA_H
+#if ATS_HAS_LZMA
case CACHE_COMPRESSION_LIBLZMA: {
size_t l = (size_t)e->len, ipos = 0, opos = 0;
uint64_t memlimit = e->len * 2 + LZMA_BASE_MEMLIMIT;
@@ -322,10 +322,10 @@ void RamCacheCLFUS::compress_entries(int
switch (ctype) {
default: goto Lcontinue;
case CACHE_COMPRESSION_FASTLZ: l = (uLongf)((double)e->len * 1.05 + 66); break;
-#if ATS_HAVE_ZLIB_H
+#if ATS_HAS_LIBZ
case CACHE_COMPRESSION_LIBZ: l = compressBound(e->len); break;
#endif
-#if ATS_HAVE_LZMA_H
+#if ATS_HAS_LZMA
case CACHE_COMPRESSION_LIBLZMA: l = e->len; break;
#endif
}
@@ -337,7 +337,7 @@ void RamCacheCLFUS::compress_entries(int
if ((l = fastlz_compress(e->data->data(), e->len, b)) <= 0)
goto Lfailed;
break;
-#if ATS_HAVE_ZLIB_H
+#if ATS_HAS_LIBZ
case CACHE_COMPRESSION_LIBZ: {
uLongf ll = l;
if ((Z_OK != compress((Bytef*)b, &ll, (Bytef*)e->data->data(), e->len)))
@@ -346,7 +346,7 @@ void RamCacheCLFUS::compress_entries(int
break;
}
#endif
-#if ATS_HAVE_LZMA_H
+#if ATS_HAS_LZMA
case CACHE_COMPRESSION_LIBLZMA: {
size_t pos = 0, ll = l;
if (LZMA_OK != lzma_easy_buffer_encode(LZMA_PRESET_DEFAULT, LZMA_CHECK_NONE, NULL,
Modified: trafficserver/traffic/trunk/libinktomi++/SimpleDBM.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/SimpleDBM.h?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/SimpleDBM.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/SimpleDBM.h Sun May 23 14:03:49 2010
@@ -43,7 +43,6 @@
#ifndef _SimpleDBM_h_
#define _SimpleDBM_h_
-#include "ink_platform.h"
#include "inktomi++.h"
class SimpleDBM;
@@ -68,26 +67,28 @@ typedef enum
extern "C"
{
-#ifdef HAVE_SQLITE3_H
-#define DEFAULT_DB_IMPLEMENTATION SimpleDBM_Type_SQLITE3
-#define SIMPLEDBM_USE_SQLITE3
-#include <sqlite3.h>
-#endif
-
-#ifdef HAVE_DB_185_H
-#ifndef DEFAULT_DB_IMPLEMENTATION
-#define DEFAULT_DB_IMPLEMENTATION SimpleDBM_Type_LIBDB_Hash
-#endif
-#define SIMPLEDBM_USE_LIBDB
-#include <db_185.h>
-#else
-#ifdef HAVE_DB_H
-#ifndef DEFAULT_DB_IMPLEMENTATION
-#define DEFAULT_DB_IMPLEMENTATION SimpleDBM_Type_LIBDB_Hash
-#endif
-#define SIMPLEDBM_USE_LIBDB
-#include <db.h>
-#endif
+#if ATS_USE_SQLITE3
+# define DEFAULT_DB_IMPLEMENTATION SimpleDBM_Type_SQLITE3
+# define SIMPLEDBM_USE_SQLITE3
+# ifdef HAVE_SQLITE3_H
+# include <sqlite3.h>
+# else
+# error Cannot use sqlite3 without sqlite3.h header
+# endif
+#endif
+
+#if ATS_USE_LIBDB
+# define DEFAULT_DB_IMPLEMENTATION SimpleDBM_Type_LIBDB_Hash
+# define SIMPLEDBM_USE_LIBDB
+# ifdef HAVE_DB_185_H
+# include <db_185.h>
+# else
+# ifdef HAVE_DB_H
+# include <db.h>
+# else
+# error Undefined db header
+# endif
+# endif
#endif
}
Modified: trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_config.h.in?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_config.h.in Sun May 23 14:03:49 2010
@@ -30,6 +30,10 @@
*
*/
+/* Include automake generated defines
+ */
+#include "ink_autoconf.h"
+
/* Version info
*/
#define ATS_VERSION_STRING "@ATS_VERSION_STRING@"
@@ -81,14 +85,9 @@
#define ATS_HAVE_EXECINFO_H @execinfoh@
/* Libraries */
-#define ATS_HAVE_ZLIB_H @zlibh@
-#define ATS_HAVE_LZMA_H @lzmah@
-#define ATS_HAVE_SQLITE3_H @sqlite3h@
-#define ATS_HAVE_DB_H @dbh@
-#define ATS_HAVE_DB_185_H @db_185h@
-#define ATS_HAVE_PCRE_H @pcreh@
-#define ATS_HAVE_PCRE_PCRE_H @pcre_pcreh@
-#define ATS_HAVE_EXPAT_H @expath@
+#define ATS_HAS_LIBZ @zlibh@
+#define ATS_HAS_LZMA @lzmah@
+#define ATS_HAS_EXPAT @expath@
/* Features */
#define ATS_HAS_EVENTFD @has_eventfd@
@@ -99,6 +98,8 @@
#define ATS_HAS_SRAND48_R @has_srand48_r@
#define ATS_HAS_STRNDUP @has_strndup@
+#define ATS_USE_SQLITE3 @use_sqlite3@
+#define ATS_USE_LIBDB @use_libdb@
#define ATS_HAS_BACKTRACE @has_backtrace@
#define ATS_HAS_PROFILER @has_profiler@
#define ATS_USE_DIAGS @use_diags@
@@ -112,9 +113,62 @@
#define GETHOSTBYNAME_R_GLIBC2 @gethostbyname_r_glibc2@
#define NEED_UNION_SEMUN @need_union_semun@
-/* This file is autogenerated without multiple include protection
- * which matters e.g. when the manager specifically undef's HTTP_CACHE
- */
-#include "ink_autoconf.h"
+/* API */
+#define ATS_IS_MICRO_BUILD @is_micro_build@
+#define ATS_HAS_STANDALONE_IOCORE @has_standalone_iocore@
+#define ATS_HAS_INKAPI @has_inkapi@
+#define ATS_HAS_CLI2 @has_cli2@
+#define ATS_HAS_WEBUI @has_webui@
+#define ATS_HAS_PURIFY @has_purify@
+#define ATS_HAS_DEMANGLE @has_demangle@
+
+/* XXX: Should make those individually selectable ? */
+/* TODO: Use ATS prefix instead no prefix or INK */
+#if ATS_IS_MICRO_BUILD
+# define TS_MICRO 1
+# define INK_NO_ACL 1
+# define INK_NO_CLUSTER 1
+# define INK_NO_DIAGS 1
+# define INK_NO_HOSTDB 1
+# define INK_NO_ICP 1
+# define INK_NO_LOG 1
+# define INK_NO_REMAP 1
+# define INK_NO_REVERSE 1
+# define INK_NO_SOCKS 1
+# define INK_NO_STAT_PAGES 1
+# define INK_NO_TESTS 1
+# define INK_USE_MUTEX_FOR_ATOMICLISTS 1
+# define INK_USE_MUTEX_FOR_FREELISTS 1
+# define USE_MD5_FOR_MMH 1
+# define _NO_FREELIST 1
+#endif
+
+#if ATS_HAS_INKAPI
+/* XXX: Should make those individually selectable ? */
+#else
+# define INK_NO_TRANSFORM 1
+# define INK_NO_API 1
+# define INK_SINGLE_THREADED 1
+#endif
+
+#if ATS_STANDALONE_IOCORE
+# define STANDALONE_IOCORE 1
+#else
+# define FIXME_NONMODULAR
+# define SPLIT_DNS 1
+# define NON_MODULAR 1
+# define HTTP_CACHE 1
+#endif
+
+#if !ATS_HAS_WEBUI
+# define NO_WEBUI 1
+#endif
+
+#if ATS_HAS_PURIFY
+# define PURIFY 1
+#endif
+
+/* TODO: Fix those always defined features */
+#define MODULARIZED
#endif /* _ink_config_h */
Modified: trafficserver/traffic/trunk/libinktomi++/ink_platform.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_platform.h?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_platform.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_platform.h Sun May 23 14:03:49 2010
@@ -28,19 +28,32 @@
#include <stdio.h>
#include <stdarg.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include <ctype.h>
-#include <string.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
#include <errno.h>
-
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-#include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
#include <fcntl.h>
#include <limits.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#include <sys/stat.h>
-
+#include <assert.h>
+#include <time.h>
#include <sys/time.h>
#include <sys/uio.h>
#include <sys/file.h>
@@ -57,43 +70,44 @@
#include <sys/socket.h>
#include <sys/mman.h>
-#if ATS_HAVE_NETINET_IN_H
+#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
-#if ATS_HAVE_NETINET_IN_SYSTM_H
+#ifdef HAVE_NETINET_IN_SYSTM_H
# include <netinet/in_systm.h>
#endif
-#if ATS_HAVE_NETINET_TCP_H
+#ifdef HAVE_NETINET_TCP_H
# include <netinet/tcp.h>
#endif
-#if ATS_HAVE_NETINET_IP_H
+#ifdef HAVE_NETINET_IP_H
# include <netinet/ip.h>
#endif
-#if ATS_HAVE_NETINET_IP_ICMP_H
+#ifdef HAVE_NETINET_IP_ICMP_H
# include <netinet/ip_icmp.h>
#endif
-#include <netdb.h>
-#if ATS_HAVE_ARPA_INET_H
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
-#if ATS_HAVE_ARPA_NAMESER_H
+#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#endif
-#if ATS_HAVE_ARPA_NAMESER_COMPAT_H
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include <signal.h>
-#if ATS_HAVE_SIGINFO_H
+#ifdef HAVE_SIGINFO_H
# include <siginfo.h>
#endif
-#if ATS_HAVE_WAIT_H
+#ifdef HAVE_WAIT_H
# include <wait.h>
#endif
#include <syslog.h>
#include <pwd.h>
-#include <strings.h>
#include <poll.h>
#if ATS_USE_EPOLL
@@ -107,24 +121,27 @@
#endif
-#if ATS_HAVE_VALUES_H
+#ifdef HAVE_VALUES_H
# include <values.h>
#endif
-#if ATS_HAVE_ALLOCA_H
+#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#endif
+#ifdef HAVE_MALLOC_H
+# include <malloc.h>
+#endif
#include <errno.h>
#include <dirent.h>
-#if ATS_HAVE_CPIO_H
+#ifdef HAVE_CPIO_H
# include <cpio.h>
#endif
struct ifafilt;
#include <net/if.h>
-#if ATS_HAVE_STROPTS_H
+#ifdef HAVE_STROPTS_H
#include <stropts.h>
#endif
@@ -136,20 +153,20 @@ struct ifafilt;
#define __STDC__ 0
#endif
-#if ATS_HAVE_MACHINE_ENDIAN_H
+#ifdef HAVE_MACHINE_ENDIAN_H
# include <machine/endian.h>
#endif
-#if ATS_HAVE_ENDIAN_H
+#ifdef HAVE_ENDIAN_H
# include <endian.h>
#endif
-#if ATS_HAVE_SYS_BYTEORDER_H
+#ifdef HAVE_SYS_BYTEORDER_H
# include <sys/byteorder.h>
#endif
-#if ATS_HAVE_SYS_IOCTL_H
+#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
-#if ATS_HAVE_SYS_SOCKIO_H
+#ifdef HAVE_SYS_SOCKIO_H
# include <sys/sockio.h>
#endif
@@ -160,26 +177,30 @@ struct ifafilt;
typedef unsigned int in_addr_t;
#endif
-#if ATS_HAVE_SYS_SYSINFO_H
+#ifdef HAVE_SYS_SYSINFO_H
# include <sys/sysinfo.h>
#endif
#if !defined(darwin)
-# if ATS_HAVE_SYS_SYSCTL_H
+# ifdef HAVE_SYS_SYSCTL_H
# include <sys/sysctl.h>
# endif
#endif
-#if ATS_HAVE_SYS_SYSTEMINFO_H
+#ifdef HAVE_SYS_SYSTEMINFO_H
# include <sys/systeminfo.h>
#endif
-#include <dlfcn.h>
-
-#if ATS_HAVE_MATH_H
+#ifdef HAVE_DLFCN_H
+# include <dlfcn.h>
+#endif
+#ifdef HAVE_MATH_H
# include <math.h>
#endif
+#ifdef HAVE_FLOAT_H
+# include <float.h>
+#endif
-#if ATS_HAVE_SYS_SYSMACROS_H
+#ifdef HAVE_SYS_SYSMACROS_H
# include <sys/sysmacros.h>
#endif
@@ -189,4 +210,4 @@ typedef unsigned int in_addr_t;
// windows-260,etc)
#endif
-#endif /* _PLATFORM_H_ */
+#endif /* _ink_platform_h */
Modified: trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_res_init.cc?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_res_init.cc Sun May 23 14:03:49 2010
@@ -76,7 +76,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <arpa/nameser.h>
-#if ATS_HAVE_ARPA_NAMESER_COMPAT_H
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
#include <arpa/nameser_compat.h>
#endif
#include <stdio.h>
Modified: trafficserver/traffic/trunk/libinktomi++/inktomi++.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/inktomi%2B%2B.h?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/inktomi++.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/inktomi++.h Sun May 23 14:03:49 2010
@@ -37,44 +37,8 @@
#if !defined (_inktomiplus_h_)
#define _inktomiplus_h_
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <errno.h>
-#include <ctype.h>
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#include <assert.h>
-#include <string.h>
-#include <memory.h>
-#include <strings.h>
-#include <unistd.h>
-#include <stdarg.h>
-#ifdef HAVE_FLOAT_H
-#include <float.h>
-#endif
-#ifdef HAVE_LIBGEN_H
-#include <libgen.h>
-#endif
-#include <limits.h>
-#include <fcntl.h>
-#include <time.h>
-#include <sys/ioctl.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#define O_TRAPERRORS 0x40000000
-
-#ifdef __cplusplus
-}
-#endif
-
+#include "ink_config.h"
+#include "ink_platform.h"
#include "ink_aiocb.h"
#include "ink_align.h"
#include "ink_apidefs.h"
@@ -97,7 +61,6 @@ extern "C"
#include "ink_lockfile.h"
#include "ink_memory.h"
#include "ink_mutex.h"
-#include "ink_platform.h"
#include "ink_port.h"
#include "ink_queue.h"
#include "ink_rand.h"
Modified: trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogConfig.cc Sun May 23 14:03:49 2010
@@ -30,10 +30,10 @@
#include "inktomi++.h"
#include "I_Layout.h"
-#if ATS_HAVE_SYS_PARAM_H
+#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
-#if ATS_HAVE_SYS_MOUNT_H
+#ifdef HAVE_SYS_MOUNT_H
#include <sys/mount.h>
#endif
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc Sun May 23 14:03:49 2010
@@ -25,7 +25,7 @@
#include "inktomi++.h"
#include "I_Layout.h"
-#if ATS_HAVE_PCRE_PCRE_H
+#ifdef HAVE_PCRE_PCRE_H
#include <pcre/pcre.h>
#else
#include <pcre.h>
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc?rev=947417&r1=947416&r2=947417&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc Sun May 23 14:03:49 2010
@@ -27,7 +27,7 @@
#include "BaseRecords.h"
#include "RecordsConfig.h"
-#if ATS_HAVE_PCRE_PCRE_H
+#ifdef HAVE_PCRE_PCRE_H
#include <pcre/pcre.h>
#else
#include <pcre.h>