rollback..Mac OSX is not working if we link libfdore/proto to the shared

object.
This commit is contained in:
Sukchan Lee 2017-11-04 10:23:07 +09:00
parent d2cf6821b8
commit d092c329da
3 changed files with 6 additions and 6 deletions

View File

@ -385,7 +385,7 @@ AC_SUBST(CORE_LIBS)
AC_SEARCH_LIBS(gethostbyname, nsl) AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(gethostname, nsl) AC_SEARCH_LIBS(gethostname, nsl)
AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(socket, socket)
AC_SEARCH_LIBS([pthread_mutex_init], pthread) AC_SEARCH_LIBS(pthread_barrier_wait, pthread)
AC_SEARCH_LIBS([sctp_sendmsg], [sctp], [have_sctp_lib=yes], [have_sctp_lib=no]) AC_SEARCH_LIBS([sctp_sendmsg], [sctp], [have_sctp_lib=yes], [have_sctp_lib=no])
if test x$have_sctp_lib == xno; then if test x$have_sctp_lib == xno; then

View File

@ -21,18 +21,14 @@ case $host in
*-apple-darwin*) *-apple-darwin*)
AC_DEFINE_UNQUOTED([DISABLE_SCTP], AC_DEFINE_UNQUOTED([DISABLE_SCTP],
[1], [Disable SCTP]) [1], [Disable SCTP])
sctp=false;
;; ;;
*-freebsd*) *-freebsd*)
AC_DEFINE_UNQUOTED([SCTP_USE_MAPPED_ADDRESSES], AC_DEFINE_UNQUOTED([SCTP_USE_MAPPED_ADDRESSES],
[1], [Disable SCTP]) [1], [Disable SCTP])
sctp=true;
;; ;;
*) *)
sctp=true;
;; ;;
esac esac
AM_CONDITIONAL([SCTP], [test x$sctp = xtrue])
AH_TOP([ AH_TOP([
#ifndef FD_IS_CONFIG #ifndef FD_IS_CONFIG
@ -143,7 +139,8 @@ AC_SEARCH_LIBS([pthread_barrier_wait], [pthread],
[AC_DEFINE([HAVE_PTHREAD_BAR], [1], [AC_DEFINE([HAVE_PTHREAD_BAR], [1],
[Define to 1 if you have pthread_barrier_wait in libpthread])], [Define to 1 if you have pthread_barrier_wait in libpthread])],
[]) [])
AC_SEARCH_LIBS([dlopen], [dl dld]) AC_SEARCH_LIBS([sctp_sendmsg], [sctp], [have_sctp_lib=yes])
AM_CONDITIONAL([SCTP], [test x$have_sctp_lib = xyes])
AC_SEARCH_LIBS([gnutls_global_init], [gnutls],, [have_gnutls_lib=no]) AC_SEARCH_LIBS([gnutls_global_init], [gnutls],, [have_gnutls_lib=no])
if test x$have_gnutls_lib == xno; then if test x$have_gnutls_lib == xno; then

3
main.c
View File

@ -11,7 +11,10 @@
/* Server */ /* Server */
#include "app.h" #include "app.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdate-time"
static char *compile_time = __DATE__ " " __TIME__; static char *compile_time = __DATE__ " " __TIME__;
#pragma GCC diagnostic pop
static void show_version() static void show_version()
{ {