Add a check for objecthash.h and make xjson-server depend on it.

Author: pphaneuf

Makefile.am

@@ -38,9 +38,13 @@ bin_PROGRAMS = \
 	cpp/server/ct-mirror-v2 \
 	cpp/server/ct-server \
 	cpp/server/ct-server-v2 \
-	cpp/server/xjson-server \
 	cpp/tools/ct-clustertool
 
+if HAVE_OBJECTHASH
+bin_PROGRAMS += \
+	cpp/server/xjson-server
+endif
+
 noinst_PROGRAMS = \
 	cpp/tools/dump_cert \
 	cpp/tools/dump_sth \
@@ -181,7 +185,6 @@ cpp_libcore_a_SOURCES = \
 	cpp/net/url_fetcher.cc \
 	cpp/proto/cert_serializer.cc \
 	cpp/proto/serializer.cc \
-	cpp/proto/xjson_serializer.cc \
 	cpp/server/metrics.cc \
 	cpp/server/proxy.cc \
 	cpp/server/server.cc \
@@ -297,12 +300,13 @@ cpp_server_xjson_server_LDADD = \
 	-lprotobuf -lsqlite3
 cpp_server_xjson_server_SOURCES = \
 	cpp/client/async_log_client.cc \
+	cpp/proto/xjson_serializer.cc \
 	cpp/server/handler.cc \
 	cpp/server/json_output.cc \
 	cpp/server/log_processes.cc \
 	cpp/server/server_helper.cc \
-	cpp/server/xjson-server.cc \
 	cpp/server/x_json_handler.cc \
+	cpp/server/xjson-server.cc \
 	cpp/util/json_wrapper.cc \
 	third_party/objecthash/objecthash.cc
 

build/configure-ct

@@ -39,7 +39,7 @@ then
       ;;
   esac
 
-  ./configure GMOCK_DIR=${GMOCK} ${CONFIGURE_FLAGS} PROTOC=${INSTALL_DIR}/bin/protoc PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" CPPFLAGS="-I${INSTALL_DIR}/include" CXXFLAGS="${CXXFLAGS} ${EXTRA_CXXFLAGS}" LDFLAGS="-L${INSTALL_DIR}/lib $EXTRA_LDFLAGS" LIBS="${EXTRA_LIBS}" INSTALL_DIR=${INSTALL_DIR} || tail -1000 config.log
+  ./configure GMOCK_DIR=${GMOCK} ${CONFIGURE_FLAGS} PROTOC=${INSTALL_DIR}/bin/protoc PKG_CONFIG_PATH="${INSTALL_DIR}/lib/pkgconfig" CPPFLAGS="-I${INSTALL_DIR}/include -I${PWD}/third_party/objecthash" CXXFLAGS="${CXXFLAGS} ${EXTRA_CXXFLAGS}" LDFLAGS="-L${INSTALL_DIR}/lib -L${PWD}/third_party/objecthash $EXTRA_LDFLAGS" LIBS="${EXTRA_LIBS}" INSTALL_DIR=${INSTALL_DIR} || tail -1000 config.log
 
   ./config.status --config
 fi

configure.ac

@@ -73,6 +73,7 @@ AC_CHECK_HEADER([google/protobuf/message.h],,
 AC_CHECK_HEADER([leveldb/db.h],,
                 [AC_MSG_ERROR([leveldb headers could not be found])])
 AC_CHECK_HEADER([ldns/ldns.h],, [missing_ldns=yes])
+AC_CHECK_HEADER([objecthash.h],, [missing_objecthash=yes])
 
 # Check for working GTest/GMock.
 saved_CPPFLAGS="$CPPFLAGS"
@@ -209,6 +210,7 @@ AC_CHECK_FUNCS([alarm gettimeofday memset mkdir select socket strdup strerror st
 
 AM_CONDITIONAL([HAVE_ANT], [test -n "$ANT"])
 AM_CONDITIONAL([HAVE_LDNS], [test -z "$missing_ldns"])
+AM_CONDITIONAL([HAVE_OBJECTHASH], [test -z "$missing_objecthash"])
 AM_CONDITIONAL([OPENSSL_IS_BORINGSSL], [test -n "$openssl_is_boringssl"])
 AC_DEFINE_UNQUOTED([TEST_SRCDIR], ["$srcdir"], [Top of the source directory, for tests.])
 AC_SUBST([INSTALL_DIR])