summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorJin^eLD <jin@mediatomb.cc>2014-03-23 01:23:36 +0100
committerJin^eLD <jin@mediatomb.cc>2014-03-23 02:05:34 +0100
commitba4681ef1eafe6de3742e037da01c1e069777470 (patch)
tree4311b1801f37ba8e56e99767737e8286ea207a50 /configure.ac
parentcb1c1d25ecdc6392ccdd5e09e2833e66e3ee931a (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
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac11
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
210if test "x$WANT_NACL" = "xyes"; then
211 enable_shared=no
212 enable_static=yes
213fi
214
210# Checks for programs. 215# Checks for programs.
211AC_PROG_CC 216AC_PROG_CC
212AM_PROG_CC_C_O 217AM_PROG_CC_C_O
@@ -214,12 +219,6 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
214AC_LIBTOOL_WIN32_DLL 219AC_LIBTOOL_WIN32_DLL
215AC_PROG_LIBTOOL 220AC_PROG_LIBTOOL
216 221
217if test "x$WANT_NACL" = "xyes"; then
218 disable_shared=yes
219 enable_static=yes
220fi
221
222
223WIN32=no 222WIN32=no
224AC_CANONICAL_HOST 223AC_CANONICAL_HOST
225case $host_os in 224case $host_os in