StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #809 from jin-eld/fix-shared-lib-builds

Browse Source 
Fix regression that disabled shared library builds
This commit is contained in:
irungentoo 2014-03-18 09:23:05 -04:00
commit 6f0f3632c0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -62,7 +62,6 @@ AC_ARG_ENABLE([nacl],
WANT_NACL="no" WANT_NACL="no"
elif test "x$enableval" = "xyes"; then elif test "x$enableval" = "xyes"; then
WANT_NACL="yes" WANT_NACL="yes"
AC_DISABLE_SHARED
fi fi
] ]
) )
@ -215,6 +214,12 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
if test "x$WANT_NACL" = "xyes"; then
disable_shared=yes
enable_static=yes
fi
WIN32=no WIN32=no
AC_CANONICAL_HOST AC_CANONICAL_HOST
case $host_os in case $host_os in