From d092c329daa389d2d7ecacad2ef3b6c03217fc96 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Sat, 4 Nov 2017 10:23:07 +0900 Subject: [PATCH] rollback..Mac OSX is not working if we link libfdore/proto to the shared object. --- configure.ac | 2 +- lib/freeDiameter-1.2.1/configure.ac | 7 ++----- main.c | 3 +++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 87c15bb84..e1449f79f 100644 --- a/configure.ac +++ b/configure.ac @@ -385,7 +385,7 @@ AC_SUBST(CORE_LIBS) AC_SEARCH_LIBS(gethostbyname, nsl) AC_SEARCH_LIBS(gethostname, nsl) 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]) if test x$have_sctp_lib == xno; then diff --git a/lib/freeDiameter-1.2.1/configure.ac b/lib/freeDiameter-1.2.1/configure.ac index edbbf0b2f..db84a2672 100644 --- a/lib/freeDiameter-1.2.1/configure.ac +++ b/lib/freeDiameter-1.2.1/configure.ac @@ -21,18 +21,14 @@ case $host in *-apple-darwin*) AC_DEFINE_UNQUOTED([DISABLE_SCTP], [1], [Disable SCTP]) - sctp=false; ;; *-freebsd*) AC_DEFINE_UNQUOTED([SCTP_USE_MAPPED_ADDRESSES], [1], [Disable SCTP]) - sctp=true; ;; *) - sctp=true; ;; esac -AM_CONDITIONAL([SCTP], [test x$sctp = xtrue]) AH_TOP([ #ifndef FD_IS_CONFIG @@ -143,7 +139,8 @@ AC_SEARCH_LIBS([pthread_barrier_wait], [pthread], [AC_DEFINE([HAVE_PTHREAD_BAR], [1], [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]) if test x$have_gnutls_lib == xno; then diff --git a/main.c b/main.c index 145483050..50a77abc3 100644 --- a/main.c +++ b/main.c @@ -11,7 +11,10 @@ /* Server */ #include "app.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdate-time" static char *compile_time = __DATE__ " " __TIME__; +#pragma GCC diagnostic pop static void show_version() {