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/22 07:51:23 UTC
svn commit: r947246 - in /trafficserver/traffic/trunk: build/common.m4
build/dbd.m4 build/lzma.m4 build/network.m4 build/pcre.m4 build/xml.m4
build/zlib.m4 configure.ac libinktomi++/ink_config.h.in
Author: mturk
Date: Sat May 22 05:51:23 2010
New Revision: 947246
URL: http://svn.apache.org/viewvc?rev=947246&view=rev
Log:
TS-366: Subst all present headers with 1 or 0 in ink_config.h
Modified:
trafficserver/traffic/trunk/build/common.m4
trafficserver/traffic/trunk/build/dbd.m4
trafficserver/traffic/trunk/build/lzma.m4
trafficserver/traffic/trunk/build/network.m4
trafficserver/traffic/trunk/build/pcre.m4
trafficserver/traffic/trunk/build/xml.m4
trafficserver/traffic/trunk/build/zlib.m4
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
Modified: trafficserver/traffic/trunk/build/common.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/common.m4?rev=947246&r1=947245&r2=947246&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/common.m4 (original)
+++ trafficserver/traffic/trunk/build/common.m4 Sat May 22 05:51:23 2010
@@ -499,33 +499,23 @@ done
])dnl
-dnl ATS_FLAG_HEADERS(HEADER-FILE ... [, FLAG-TO-SET ] [, "yes" ])
-dnl we set FLAG-TO-SET to 1 if we find HEADER-FILE, otherwise we set to 0
-dnl if FLAG-TO-SET is null, we automagically determine it's name
-dnl by changing all "/" to "_" in the HEADER-FILE and dropping
-dnl all "." and "-" chars. If the 3rd parameter is "yes" then instead of
-dnl setting to 1 or 0, we set FLAG-TO-SET to yes or no.
+dnl ATS_FLAG_HEADERS(HEADER-FILE ... )
dnl
AC_DEFUN([ATS_FLAG_HEADERS], [
-AC_CHECK_HEADERS($1)
+AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
for tsc_i in $1
do
ac_safe=`echo "$tsc_i" | sed 'y%./+-%__p_%'`
tsc_2=`echo "$tsc_i" | sed -e 's%/%_%g' -e 's/\.//g' -e 's/-//g'`
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- eval "ifelse($2,,$tsc_2,$2)=ifelse($3,yes,yes,1)"
+ eval "$tsc_2=1"
else
- eval "ifelse($2,,$tsc_2,$2)=ifelse($3,yes,no,0)"
+ eval "$tsc_2=0"
fi
done
])
-dnl ATS_FLAG_FUNCS(FUNC ... [, FLAG-TO-SET] [, "yes" ])
-dnl if FLAG-TO-SET is null, we automagically determine it's name
-dnl prepending "have_" to the function name in FUNC, otherwise
-dnl we use what's provided as FLAG-TO-SET. If the 3rd parameter
-dnl is "yes" then instead of setting to 1 or 0, we set FLAG-TO-SET
-dnl to yes or no.
+dnl ATS_FLAG_FUNCS(FUNC ... )
dnl
AC_DEFUN([ATS_FLAG_FUNCS], [
AC_CHECK_FUNCS($1)
@@ -533,9 +523,9 @@ for tsc_j in $1
do
tsc_3="have_$tsc_j"
if eval "test \"`echo '$ac_cv_func_'$tsc_j`\" = yes"; then
- eval "ifelse($2,,$tsc_3,$2)=ifelse($3,yes,yes,1)"
+ eval "$tsc_3=1"
else
- eval "ifelse($2,,$tsc_3,$2)=ifelse($3,yes,no,0)"
+ eval "$tsc_3=0"
fi
done
])
Modified: trafficserver/traffic/trunk/build/dbd.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/dbd.m4?rev=947246&r1=947245&r2=947246&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/dbd.m4 (original)
+++ trafficserver/traffic/trunk/build/dbd.m4 Sat May 22 05:51:23 2010
@@ -73,6 +73,7 @@ else
fi
fi
+sqlite3h=0
if test "$enable_sqlite3" != "no"; then
saved_ldflags=$LDFLAGS
saved_cppflags=$CPPFLAGS
@@ -89,7 +90,7 @@ if test "$enable_sqlite3" != "no"; then
fi
AC_CHECK_LIB(sqlite3, sqlite3_open_v2, [sqlite3_have_libs=1])
if test "$sqlite3_have_libs" != "0"; then
- AC_CHECK_HEADERS(sqlite3.h, [sqlite3_have_headers=1])
+ ATS_FLAG_HEADERS(sqlite3.h, [sqlite3_have_headers=1])
fi
if test "$sqlite3_have_headers" != "0"; then
AC_DEFINE(HAVE_SQLITE3,1,[Compiling with Sqlite3 support])
@@ -100,6 +101,7 @@ if test "$enable_sqlite3" != "no"; then
LDFLAGS=$saved_ldflags
fi
fi
+AC_SUBST(sqlite3h)
])
dnl
@@ -157,6 +159,8 @@ else
fi
fi
+db_185h=0
+dbh=0
if test "$enable_libdb" != "no"; then
saved_ldflags=$LDFLAGS
saved_cppflags=$CPPFLAGS
@@ -174,7 +178,7 @@ if test "$enable_libdb" != "no"; then
AC_CHECK_LIB(db, __db_open, [libdb_have_libs=1])
AC_CHECK_LIB(db, __db185_open, [libdb_have_libs=1])
if test "$libdb_have_libs" != "0"; then
- AC_CHECK_HEADERS(db_185.h db.h, [libdb_have_headers=1])
+ 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])
@@ -185,4 +189,7 @@ if test "$enable_libdb" != "no"; then
LDFLAGS=$saved_ldflags
fi
fi
+AC_SUBST(db_185h)
+AC_SUBST(dbh)
+
])
Modified: trafficserver/traffic/trunk/build/lzma.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/lzma.m4?rev=947246&r1=947245&r2=947246&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/lzma.m4 (original)
+++ trafficserver/traffic/trunk/build/lzma.m4 Sat May 22 05:51:23 2010
@@ -73,6 +73,7 @@ else
fi
fi
+lzmah=0
if test "$enable_lzma" != "no"; then
saved_ldflags=$LDFLAGS
saved_cppflags=$CPPFLAGS
@@ -89,7 +90,7 @@ if test "$enable_lzma" != "no"; then
fi
AC_CHECK_LIB(lzma, lzma_code, [lzma_have_libs=1])
if test "$lzma_have_libs" != "0"; then
- AC_CHECK_HEADERS(lzma.h, [lzma_have_headers=1])
+ 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])
@@ -100,4 +101,5 @@ if test "$enable_lzma" != "no"; then
LDFLAGS=$saved_ldflags
fi
fi
+AC_SUBST(lzmah)
])
Modified: trafficserver/traffic/trunk/build/network.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/network.m4?rev=947246&r1=947245&r2=947246&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/network.m4 (original)
+++ trafficserver/traffic/trunk/build/network.m4 Sat May 22 05:51:23 2010
@@ -54,7 +54,10 @@ tmp=0;
], ac_cv_gethostbyname_r_style=glibc2, ac_cv_gethostbyname_r_style=none))
if test "$ac_cv_gethostbyname_r_style" = "glibc2"; then
- AC_DEFINE(GETHOSTBYNAME_R_GLIBC2, 1, [Define if gethostbyname_r has the glibc style])
+ gethostbyname_r_glibc2=1
+ AC_DEFINE(GETHOSTBYNAME_R_GLIBC2, 1, [Define if gethostbyname_r has the glibc style])
+else
+ gethostbyname_r_glibc2=0
fi
AC_CACHE_CHECK([3rd argument to the gethostbyname_r routines], ac_cv_gethostbyname_r_arg,
@@ -82,8 +85,13 @@ tmp=0;
], ac_cv_gethostbyname_r_arg=hostent_data, ac_cv_gethostbyname_r_arg=char))
if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then
- AC_DEFINE(GETHOSTBYNAME_R_HOSTENT_DATA, 1, [Define if gethostbyname_r has the hostent_data for the third argument])
+ gethostbyname_r_hostent_data=1
+ AC_DEFINE(GETHOSTBYNAME_R_HOSTENT_DATA, 1, [Define if gethostbyname_r has the hostent_data for the third argument])
+else
+ gethostbyname_r_hostent_data=0
fi
+AC_SUBST(gethostbyname_r_glibc2)
+AC_SUBST(gethostbyname_r_hostent_data)
])
dnl
Modified: trafficserver/traffic/trunk/build/pcre.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/pcre.m4?rev=947246&r1=947245&r2=947246&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/pcre.m4 (original)
+++ trafficserver/traffic/trunk/build/pcre.m4 Sat May 22 05:51:23 2010
@@ -73,6 +73,8 @@ else
fi
fi
+pcreh=0
+pcre_pcreh=0
if test "$enable_pcre" != "no"; then
saved_ldflags=$LDFLAGS
saved_cppflags=$CPPFLAGS
@@ -89,8 +91,8 @@ if test "$enable_pcre" != "no"; then
fi
AC_CHECK_LIB(pcre, pcre_exec, [pcre_have_libs=1])
if test "$pcre_have_libs" != "0"; then
- AC_CHECK_HEADERS(pcre.h, [pcre_have_headers=1])
- AC_CHECK_HEADERS(pcre/pcre.h, [pcre_have_headers=1])
+ ATS_FLAG_HEADERS(pcre.h, [pcre_have_headers=1])
+ ATS_FLAG_HEADERS(pcre/pcre.h, [pcre_have_headers=1])
fi
if test "$pcre_have_headers" != "0"; then
AC_DEFINE(HAVE_LIBPCRE,1,[Compiling with pcre support])
@@ -101,4 +103,6 @@ if test "$enable_pcre" != "no"; then
LDFLAGS=$saved_ldflags
fi
fi
+AC_SUBST(pcreh)
+AC_SUBST(pcre_pcreh)
])
Modified: trafficserver/traffic/trunk/build/xml.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/xml.m4?rev=947246&r1=947245&r2=947246&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/xml.m4 (original)
+++ trafficserver/traffic/trunk/build/xml.m4 Sat May 22 05:51:23 2010
@@ -81,6 +81,7 @@ else
fi
fi
+expath=0
if test "$enable_expat" != "no"; then
saved_ldflags=$LDFLAGS
saved_cppflags=$CPPFLAGS
@@ -97,7 +98,7 @@ if test "$enable_expat" != "no"; then
fi
AC_CHECK_LIB(expat, XML_SetUserData, [expat_have_libs=1])
if test "$expat_have_libs" != "0"; then
- AC_CHECK_HEADERS(expat.h, [expat_have_headers=1])
+ ATS_FLAG_HEADERS(expat.h, [expat_have_headers=1])
fi
if test "$expat_have_headers" != "0"; then
enable_xml=yes
@@ -110,5 +111,5 @@ if test "$enable_expat" != "no"; then
LDFLAGS=$saved_ldflags
fi
fi
-
+AC_SUBST(expath)
])
Modified: trafficserver/traffic/trunk/build/zlib.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/zlib.m4?rev=947246&r1=947245&r2=947246&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/zlib.m4 (original)
+++ trafficserver/traffic/trunk/build/zlib.m4 Sat May 22 05:51:23 2010
@@ -73,6 +73,7 @@ else
fi
fi
+zlibh=0
if test "$enable_zlib" != "no"; then
saved_ldflags=$LDFLAGS
saved_cppflags=$CPPFLAGS
@@ -89,7 +90,7 @@ if test "$enable_zlib" != "no"; then
fi
AC_CHECK_LIB(z, zlibVersion, [zlib_have_libs=1])
if test "$zlib_have_libs" != "0"; then
- AC_CHECK_HEADERS(zlib.h, [zlib_have_headers=1])
+ 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])
@@ -100,4 +101,5 @@ if test "$enable_zlib" != "no"; then
LDFLAGS=$saved_ldflags
fi
fi
+AC_SUBST(zlibh)
])
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=947246&r1=947245&r2=947246&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Sat May 22 05:51:23 2010
@@ -807,10 +807,46 @@ ATS_FLAG_HEADERS([sys/epoll.h \
sys/param.h \
sys/sysmacros.h \
math.h \
- net/ppp_defs.h \
- ], [], [])
+ net/ppp_defs.h])
+
+AC_SUBST(sys_epollh)
+AC_SUBST(sys_eventh)
+AC_SUBST(machine_endianh)
+AC_SUBST(endianh)
+AC_SUBST(sys_sysinfoh)
+AC_SUBST(sys_sysctlh)
+AC_SUBST(sys_systeminfoh)
+AC_SUBST(netinet_inh)
+AC_SUBST(netinet_in_systmh)
+AC_SUBST(sys_ioctlh)
+AC_SUBST(sys_byteorderh)
+AC_SUBST(sys_sockioh)
+AC_SUBST(sys_sysctlh)
+AC_SUBST(sys_sysinfoh)
+AC_SUBST(sys_systeminfoh)
+AC_SUBST(arpa_ineth)
+AC_SUBST(arpa_nameserh)
+AC_SUBST(arpa_nameser_compath)
+AC_SUBST(execinfoh)
+AC_SUBST(netdbh)
+AC_SUBST(ctypeh)
+
+AC_SUBST(siginfoh)
+AC_SUBST(malloch)
+AC_SUBST(waith)
+AC_SUBST(floath)
+AC_SUBST(libgenh)
+AC_SUBST(valuesh)
+AC_SUBST(allocah)
+AC_SUBST(cpioh)
+AC_SUBST(stroptsh)
+AC_SUBST(sys_mounth)
+AC_SUBST(sys_paramh)
+AC_SUBST(sys_sysmacrosh)
+AC_SUBST(mathh)
+AC_SUBST(net_ppp_defsh)
-AC_CHECK_HEADERS([netinet/ip.h], [], [],
+ATS_FLAG_HEADERS([netinet/ip.h], [], [],
[[#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@@ -819,7 +855,7 @@ AC_CHECK_HEADERS([netinet/ip.h], [], [],
#endif
]])
-AC_CHECK_HEADERS([netinet/ip_icmp.h], [], [],
+ATS_FLAG_HEADERS([netinet/ip_icmp.h], [], [],
[[#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@@ -834,6 +870,9 @@ AC_CHECK_HEADERS([netinet/ip_icmp.h], []
#endif
]])
+AC_SUBST(netinet_iph)
+AC_SUBST(netinet_ip_icmph)
+
if test "x${with_profiler}" = "xyes"; then
ATS_FLAG_HEADERS([google/profiler.h \
], [], [])
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=947246&r1=947245&r2=947246&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_config.h.in Sat May 22 05:51:23 2010
@@ -32,16 +32,66 @@
/* Version info
*/
-#define ATS_VERSION_STRING "@ATS_VERSION_STRING@"
-#define ATS_VERSION_NUMBER @ATS_VERSION_NUMBER@
-#define ATS_VERSION_MAJOR @ATS_VERSION_MAJOR@
-#define ATS_VERSION_MINOR @ATS_VERSION_MINOR@
-#define ATS_VERSION_MICRO @ATS_VERSION_MICRO@
-
-#define HOST_OS @HOST_OS@
-#define BUILD_MACHINE "@build_machine@"
-#define BUILD_PERSON "@build_person@"
-#define BUILD_GROUP "@build_group@"
+#define ATS_VERSION_STRING "@ATS_VERSION_STRING@"
+#define ATS_VERSION_NUMBER @ATS_VERSION_NUMBER@
+#define ATS_VERSION_MAJOR @ATS_VERSION_MAJOR@
+#define ATS_VERSION_MINOR @ATS_VERSION_MINOR@
+#define ATS_VERSION_MICRO @ATS_VERSION_MICRO@
+
+#define HOST_OS @HOST_OS@
+#define BUILD_MACHINE "@build_machine@"
+#define BUILD_PERSON "@build_person@"
+#define BUILD_GROUP "@build_group@"
+
+#define ATS_HAVE_SYS_EPOLL_H @sys_epollh@
+#define ATS_HAVE_SYS_EVENT_H @sys_eventh@
+#define ATS_HAVE_MACHINE_ENDIAN_H @machine_endianh@
+#define ATS_HAVE_ENDIAN_H @endianh@
+#define ATS_HAVE_SYS_SYSINFO_H @sys_sysinfoh@
+#define ATS_HAVE_SYS_SYSCTL_H @sys_sysctlh@
+#define ATS_HAVE_SYS_SYSTEMINFO_H @sys_systeminfoh@
+#define ATS_HAVE_NETINET_IN_H @netinet_inh@
+#define ATS_HAVE_NETINET_IN_SYSTM_H @netinet_in_systmh@
+#define ATS_HAVE_SYS_IOCTL_H @sys_ioctlh@
+#define ATS_HAVE_SYS_BYTEORDER_H @sys_byteorderh@
+#define ATS_HAVE_SYS_SOCKIO_H @sys_sockioh@
+#define ATS_HAVE_SYS_SYSCTL_H @sys_sysctlh@
+#define ATS_HAVE_SYS_SYSINFO_H @sys_sysinfoh@
+#define ATS_HAVE_SYS_SYSTEMINFO_H @sys_systeminfoh@
+#define ATS_HAVE_ARPA_INET_H @arpa_ineth@
+#define ATS_HAVE_ARPA_NAMESER_H @arpa_nameserh@
+#define ATS_HAVE_ARPA_NAMESER_COMPAT_H @arpa_nameser_compath@
+#define ATS_HAVE_EXECINFO_H @execinfoh@
+#define ATS_HAVE_NETDB_H @netdbh@
+#define ATS_HAVE_CTYPE_H @ctypeh@
+#define ATS_HAVE_SIGINFO_H @siginfoh@
+#define ATS_HAVE_MALLOC_H @malloch@
+#define ATS_HAVE_WAIT_H @waith@
+#define ATS_HAVE_FLOAT_H @floath@
+#define ATS_HAVE_LIBGEN_H @libgenh@
+#define ATS_HAVE_VALUES_H @valuesh@
+#define ATS_HAVE_ALLOCA_H @allocah@
+#define ATS_HAVE_CPIO_H @cpioh@
+#define ATS_HAVE_STROPTS_H @stroptsh@
+#define ATS_HAVE_SYS_MOUNT_H @sys_mounth@
+#define ATS_HAVE_SYS_PARAM_H @sys_paramh@
+#define ATS_HAVE_SYS_SYSMACROS_H @sys_sysmacrosh@
+#define ATS_HAVE_MATH_H @mathh@
+#define ATS_HAVE_NET_PPP_DEFS_H @net_ppp_defsh@
+#define ATS_HAVE_NETINET_IP_H @netinet_iph@
+#define ATS_HAVE_NETINET_IP_ICMP_H @netinet_ip_icmph@
+
+#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 GETHOSTBYNAME_R_HOSTENT_DATA @gethostbyname_r_hostent_data@
+#define GETHOSTBYNAME_R_GLIBC2 @gethostbyname_r_glibc2@
/* This file is autogenerated without multiple include protection
* which matters e.g. when the manager specifically undef's HTTP_CACHE