diff options
author | irungentoo <irungentoo@gmail.com> | 2013-08-29 17:55:58 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-08-29 17:55:58 -0400 |
commit | ea994606fe4ee57f2d6ac1ddfb2225f8a1aacef0 (patch) | |
tree | 4c7f407486c8780ceaf68bbf17f7266027ed9d05 /configure.ac | |
parent | 85940f94b2560f87988da8e793eb8998c5b77ead (diff) | |
parent | 82b8927af7f68bbfbf83bbb5ffbc747de7bc288f (diff) |
Merge branch 'master' of https://github.com/JamoBox/ProjectTox-Core into JamoBox-master
Conflicts:
toxcore/LAN_discovery.h
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index a06d3598..a16f6a4f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -91,7 +91,7 @@ AC_ARG_WITH(libsodium-headers, | |||
91 | [search for libsodium header files in DIR]), | 91 | [search for libsodium header files in DIR]), |
92 | [ | 92 | [ |
93 | LIBSODIUM_SEARCH_HEADERS="$withval" | 93 | LIBSODIUM_SEARCH_HEADERS="$withval" |
94 | AC_MSG_NOTICE([Will search for libsodium header files in $withval]) | 94 | AC_MSG_NOTICE([will search for libsodium header files in $withval]) |
95 | ] | 95 | ] |
96 | ) | 96 | ) |
97 | 97 | ||
@@ -100,7 +100,7 @@ AC_ARG_WITH(libsodium-libs, | |||
100 | [search for libsodium libraries in DIR]), | 100 | [search for libsodium libraries in DIR]), |
101 | [ | 101 | [ |
102 | LIBSODIUM_SEARCH_LIBS="$withval" | 102 | LIBSODIUM_SEARCH_LIBS="$withval" |
103 | AC_MSG_NOTICE([Will search for libsodium libraries in $withval]) | 103 | AC_MSG_NOTICE([will search for libsodium libraries in $withval]) |
104 | ] | 104 | ] |
105 | ) | 105 | ) |
106 | 106 | ||