Skip to content

Commit 025a5ca

Browse files
RJPercivalpphaneuf
authored andcommitted
Fixes typos and formatting (google#1148)
* Fixes typos * Fixes formatting in configure.ac * Double-quote code in configure.ac * Prevents macro substitution. * Addresses review comments
1 parent a600f70 commit 025a5ca

File tree

3 files changed

+16
-21
lines changed

3 files changed

+16
-21
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
vars = {
2-
# Change this variable to the name of one of the alterniative SSL
2+
# Change this variable to the name of one of the alternative SSL
33
# implementations below.
44
# If you change this in an existing client, you should probably rm -fr
55
# all the deps and rebuild everything from scratch.

build.gclient

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export INSTALL_DIR
55
PKG_CONFIG_PATH=$(shell pwd)/install/lib/pkgconfig
66
export PKG_CONFIG_PATH
77

8-
PHONY: libunwind tcmalloc objecthash borginssl openssl protobuf libevent libevhtp gflags glog ldns sqlite3 leveldb json-c configure-ct
8+
PHONY: libunwind tcmalloc objecthash boringssl openssl protobuf libevent libevhtp gflags glog ldns sqlite3 leveldb json-c configure-ct
99

1010
all: configure-ct
1111

configure.ac

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ AC_SEARCH_LIBS([clock_gettime], [rt],,, [$save_LIBS])
105105

106106
AC_MSG_CHECKING([checking for gflags library])
107107
LIBS="-lgflags $LIBS"
108-
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <gflags/gflags.h>], [google::ParseCommandLineFlags(NULL, NULL, true)])], [have_gflags=yes], [have_gflags=no])
108+
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gflags/gflags.h>]], [[google::ParseCommandLineFlags(NULL, NULL, true)]])], [have_gflags=yes], [have_gflags=no])
109109
AC_MSG_RESULT([$have_gflags])
110110
AS_IF([test "x$have_gflags" = "xno"],
111111
[AC_MSG_ERROR([gflags library could not be found])])
112112

113113
AC_MSG_CHECKING([checking for glog library])
114114
LIBS="-lglog $LIBS"
115-
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <glog/logging.h>], [google::InitGoogleLogging(NULL)])], [have_glog=yes], [have_glog=no])
115+
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glog/logging.h>]], [[google::InitGoogleLogging(NULL)]])], [have_glog=yes], [have_glog=no])
116116
AC_MSG_RESULT([$have_glog])
117117
AS_IF([test "x$have_glog" = "xno"],
118118
[AC_MSG_ERROR([glog library could not be found])])
@@ -135,20 +135,15 @@ AS_IF([test -n "$missing_openssl"],
135135
[AC_MSG_ERROR([could not find the OpenSSL libraries])])
136136

137137
AC_MSG_CHECKING([for BoringSSL])
138-
AC_COMPILE_IFELSE([
139-
AC_LANG_PROGRAM([[
140-
#include <openssl/base.h>
141-
]],[[
142-
#ifndef OPENSSL_IS_BORINGSSL
143-
#error not boringssl
144-
#endif
145-
]])
146-
],[
147-
AC_MSG_RESULT([yes])
148-
openssl_is_boringssl=1
149-
],[
150-
AC_MSG_RESULT([no])
151-
])
138+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/base.h>]],
139+
[[
140+
#ifndef OPENSSL_IS_BORINGSSL
141+
# error not boringssl
142+
#endif
143+
]])
144+
],
145+
[AC_MSG_RESULT([yes]); openssl_is_boringssl=1],
146+
[AC_MSG_RESULT([no])])
152147

153148
save_LIBS="$LIBS"
154149
AS_UNSET([LIBS])
@@ -189,13 +184,13 @@ AC_TYPE_UINT64_T
189184
AC_TYPE_UINT8_T
190185

191186
CT_CHECK_TLS
192-
AC_CHECK_DECLS([INADDR_LOOPBACK], [], [], [#include <netinet/in.h>])
187+
AC_CHECK_DECLS([INADDR_LOOPBACK], [], [], [[#include <netinet/in.h>]])
193188

194189
AC_MSG_CHECKING([whether pthread_t is a pointer])
195-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
190+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
196191
#include <pthread.h>
197192
void TakesPointer(void*);
198-
], [TakesPointer(pthread_self())])], [PTHREAD_T_IS_POINTER=yes],
193+
]], [[TakesPointer(pthread_self())]])], [PTHREAD_T_IS_POINTER=yes],
199194
[PTHREAD_T_IS_POINTER=no])
200195
AC_MSG_RESULT([$PTHREAD_T_IS_POINTER])
201196
AS_IF([test "x$PTHREAD_T_IS_POINTER" = xyes],

0 commit comments

Comments
 (0)