diff options
author | Jin^eLD <jin@mediatomb.cc> | 2014-03-23 01:23:36 +0100 |
---|---|---|
committer | Jin^eLD <jin@mediatomb.cc> | 2014-03-23 02:05:34 +0100 |
commit | ba4681ef1eafe6de3742e037da01c1e069777470 (patch) | |
tree | 4311b1801f37ba8e56e99767737e8286ea207a50 | |
parent | cb1c1d25ecdc6392ccdd5e09e2833e66e3ee931a (diff) |
Fix shared/static settings when building vs. NaCl library
Make sure the shared lib build is really disabled when compiling vs.
NaCl:
moved settings before libtool initialization
fixed parameter name
-rw-r--r-- | configure.ac | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 896e586a..df026990 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -207,6 +207,11 @@ AC_ARG_WITH(libsodium-libs, | |||
207 | ] | 207 | ] |
208 | ) | 208 | ) |
209 | 209 | ||
210 | if test "x$WANT_NACL" = "xyes"; then | ||
211 | enable_shared=no | ||
212 | enable_static=yes | ||
213 | fi | ||
214 | |||
210 | # Checks for programs. | 215 | # Checks for programs. |
211 | AC_PROG_CC | 216 | AC_PROG_CC |
212 | AM_PROG_CC_C_O | 217 | AM_PROG_CC_C_O |
@@ -214,12 +219,6 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) | |||
214 | AC_LIBTOOL_WIN32_DLL | 219 | AC_LIBTOOL_WIN32_DLL |
215 | AC_PROG_LIBTOOL | 220 | AC_PROG_LIBTOOL |
216 | 221 | ||
217 | if test "x$WANT_NACL" = "xyes"; then | ||
218 | disable_shared=yes | ||
219 | enable_static=yes | ||
220 | fi | ||
221 | |||
222 | |||
223 | WIN32=no | 222 | WIN32=no |
224 | AC_CANONICAL_HOST | 223 | AC_CANONICAL_HOST |
225 | case $host_os in | 224 | case $host_os in |