tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/libdl-freebsd-4977' into next 

Fixes #4977
This commit is contained in:
Gunnar Beutner 2013-10-30 13:04:24 +01:00
parent 9ddd14e0fe ef55412855
commit 25998e9ad8
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/demo/Makefile.am
View File

@ -6,7 +6,7 @@ pkglib_LTLIBRARIES = \
BUILT_SOURCES = \ BUILT_SOURCES = \
demo.th demo.th
nodist_libdemo_SOURCES = $(BUILT_SOURCES) nodist_libdemo_la_SOURCES = $(BUILT_SOURCES)
CLEANFILES = \ CLEANFILES = \
demo-type.cpp demo-type.cpp

3
configure.ac
View File

@ -112,6 +112,9 @@ AC_CHECK_LIB(ws2_32, getsockname)
AC_CHECK_LIB(shlwapi, PathRemoveFileSpecA) AC_CHECK_LIB(shlwapi, PathRemoveFileSpecA)
AC_CHECK_FUNCS([backtrace_symbols execvpe pipe2 pthread_set_name_np pthread_setname_np]) AC_CHECK_FUNCS([backtrace_symbols execvpe pipe2 pthread_set_name_np pthread_setname_np])
AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
AC_SUBST([LIBDL])
AC_TRY_LINK([#include <openssl/evp.h> AC_TRY_LINK([#include <openssl/evp.h>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/comp.h>], [BIO_f_zlib();], ac_cv_lib_biozlib="yes") #include <openssl/comp.h>], [BIO_f_zlib();], ac_cv_lib_biozlib="yes")

2
lib/base/Makefile.am
View File

@ -142,7 +142,7 @@ libbase_la_LDFLAGS = \
@VERSION_INFO@ @VERSION_INFO@
libbase_la_LIBADD = \ libbase_la_LIBADD = \
-ldl \ $(LIBDL) \
$(OPENSSL_LIBS) \ $(OPENSSL_LIBS) \
$(BOOST_SIGNALS_LIB) \ $(BOOST_SIGNALS_LIB) \
$(BOOST_THREAD_LIB) \ $(BOOST_THREAD_LIB) \

2
lib/icinga/Makefile.am
View File

@ -20,7 +20,7 @@ BUILT_SOURCES = \
user.th \ user.th \
usergroup.th usergroup.th
nodist_libicinga_SOURCES = $(BUILT_SOURCES) nodist_libicinga_la_SOURCES = $(BUILT_SOURCES)
CLEANFILES = \ CLEANFILES = \
icinga-type.cpp icinga-type.cpp