summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-06-24 22:56:07 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-07-01 08:35:44 +0000
commit1a54be06cd359257478b584611f34058d21fe723 (patch)
treedb3d6ca2dfa2a87ae2efdac6e412c2b780a64009 /configure.ac
parent706fad1ce88c2104009a3835ee343ff9d8ec8b79 (diff)
Simplify Travis CI builds.
Have one script per build. This means more duplication between the scripts, but it's much easier to understand and to run locally.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 450a1d53..d070cd77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -350,7 +350,9 @@ if test "x$WANT_NACL" = "xyes"; then
350 if (test -f "$NACL_SEARCH_LIBS/cpucycles.o") && 350 if (test -f "$NACL_SEARCH_LIBS/cpucycles.o") &&
351 (test -f "$NACL_SEARCH_LIBS/randombytes.o"); then 351 (test -f "$NACL_SEARCH_LIBS/randombytes.o"); then
352 NACL_OBJECTS="$NACL_SEARCH_LIBS/cpucycles.o $NACL_SEARCH_LIBS/randombytes.o" 352 NACL_OBJECTS="$NACL_SEARCH_LIBS/cpucycles.o $NACL_SEARCH_LIBS/randombytes.o"
353 AC_MSG_NOTICE([found extra NaCl objects: $NACL_OBJECTS])
353 if test "x$ADD_NACL_OBJECTS_TO_PKGCONFIG" = "xyes"; then 354 if test "x$ADD_NACL_OBJECTS_TO_PKGCONFIG" = "xyes"; then
355 AC_MSG_NOTICE([adding extra NaCl objects to pkg-config file])
354 NACL_OBJECTS_PKGCONFIG="$NACL_OBJECTS" 356 NACL_OBJECTS_PKGCONFIG="$NACL_OBJECTS"
355 fi 357 fi
356 else 358 else