Browse Source

Fix #533

pull/542/head
Max Lv 8 years ago
parent
commit
682aabca04
1 changed files with 6 additions and 4 deletions
  1. 10
      configure.ac

10
configure.ac

@ -126,6 +126,12 @@ case $host in
;; ;;
esac esac
dnl Checks for pthread
AX_PTHREAD([LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"], AC_MSG_ERROR(Can not find pthreads. This is required.))
dnl Checks for stack protector
GGL_CHECK_STACK_PROTECTOR([has_stack_protector=yes], [has_stack_protector=no]) GGL_CHECK_STACK_PROTECTOR([has_stack_protector=yes], [has_stack_protector=no])
# XXX - disable -fstack-protector due to missing libssp_nonshared # XXX - disable -fstack-protector due to missing libssp_nonshared
case "$host_os" in case "$host_os" in
@ -267,10 +273,6 @@ AC_CHECK_LIB(socket, connect)
dnl Checks for library functions. dnl Checks for library functions.
AC_CHECK_FUNCS([malloc memset socket]) AC_CHECK_FUNCS([malloc memset socket])
AX_PTHREAD([LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
CC="$PTHREAD_CC"], AC_MSG_ERROR(Can not find pthreads. This is required.))
AM_COND_IF([USE_SYSTEM_SHARED_LIB], AM_COND_IF([USE_SYSTEM_SHARED_LIB],
[], [],
[AC_CONFIG_SUBDIRS([libsodium])]) [AC_CONFIG_SUBDIRS([libsodium])])

Loading…
Cancel
Save