You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ge...@apache.org on 2010/02/10 08:34:22 UTC
svn commit: r908372 -
/incubator/trafficserver/traffic/branches/dev/configure.ac
Author: georgep
Date: Wed Feb 10 07:34:21 2010
New Revision: 908372
URL: http://svn.apache.org/viewvc?rev=908372&view=rev
Log:
TS-50: Fix latest merge from trunk into dev on FreeBSD.
Modified:
incubator/trafficserver/traffic/branches/dev/configure.ac
Modified: incubator/trafficserver/traffic/branches/dev/configure.ac
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/configure.ac?rev=908372&r1=908371&r2=908372&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/configure.ac (original)
+++ incubator/trafficserver/traffic/branches/dev/configure.ac Wed Feb 10 07:34:21 2010
@@ -582,7 +582,7 @@
[$LIBTHREAD]
)
-if test "x${with_sqlite3}" == "xyes"; then
+if test "x${with_sqlite3}" = "xyes"; then
AC_CHECK_LIB([sqlite3], [sqlite3_open],
[AC_SUBST([LIBSQLITE3], ["-lsqlite3"])
],
@@ -591,7 +591,7 @@
fi
-if test "x${with_libdb}" == "xyes"; then
+if test "x${with_libdb}" = "xyes"; then
# Berkeley DB check:
# TODO: Better checking for versions/directories similar to TCL
ts_have_db=0
@@ -711,7 +711,7 @@
sys/sysinfo.h \
sys/sysctl.h \
sys/systeminfo.h \
- netinet/ip.h \
+ netinet/in.h \
sys/ioctl.h \
sys/byteorder.h \
sys/sockio.h \
@@ -739,19 +739,34 @@
math.h \
], [], [])
+AC_CHECK_HEADERS([netinet/ip.h], [], [],
+ [[#ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
+ ]])
+
AC_CHECK_HEADERS([netinet/ip_icmp.h], [], [],
- [[#ifdef HAVE_NETINET_IP_H
+ [[#ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ #ifdef HAVE_NETINET_IN_H
+ #include <netinet/in.h>
+ #endif
+ #ifdef HAVE_NETINET_IP_H
#include <netinet/ip.h>
#endif
]])
-if test "x${with_libdb}" == "xyes"; then
+if test "x${with_libdb}" = "xyes"; then
AC_CHECK_HEADERS([db_185.h \
db.h \
], [], [])
fi
-if test "x${with_sqlite3}" == "xyes"; then
+if test "x${with_sqlite3}" = "xyes"; then
AC_CHECK_HEADERS([sqlite3.h \
], [], [])
fi