You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
3.1 KiB
48 lines
3.1 KiB
diff -u --recursive syslog-ng-3.16.1-vanilla/configure.ac syslog-ng-3.16.1/configure.ac
|
|
--- syslog-ng-3.16.1-vanilla/configure.ac 2018-06-01 06:02:07.000000000 -0400
|
|
+++ syslog-ng-3.16.1/configure.ac 2018-07-15 19:31:30.307354198 -0400
|
|
@@ -793,6 +793,14 @@
|
|
AC_CHECK_FUNCS([inotify_init])
|
|
|
|
dnl ***************************************************************************
|
|
+dnl secret-storage headers/libraries
|
|
+dnl ***************************************************************************
|
|
+
|
|
+SECRET_STORAGE_LIBS="\$(top_builddir)/lib/secret-storage/libsecret-storage.la"
|
|
+SECRET_STORAGE_NO_LIBTOOL_LIBS="\$(top_builddir)/lib/eventlog/src/.libs/libsecret-storage.so"
|
|
+SECRET_STORAGE_CFLAGS="-I\$(top_srcdir)/lib/secret-storage"
|
|
+
|
|
+dnl ***************************************************************************
|
|
dnl libevtlog headers/libraries (remove after relicensing libevtlog)
|
|
dnl ***************************************************************************
|
|
|
|
@@ -1592,7 +1600,7 @@
|
|
java_module_path="$moduledir"/java-modules
|
|
fi
|
|
|
|
-CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS $EVTLOG_CFLAGS $PCRE_CFLAGS $OPENSSL_CFLAGS $LIBNET_CFLAGS $LIBDBI_CFLAGS $IVYKIS_CFLAGS -D_GNU_SOURCE -D_DEFAULT_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
|
|
+CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS $EVTLOG_CFLAGS $SECRET_STORAGE_CFLAGS $PCRE_CFLAGS $OPENSSL_CFLAGS $LIBNET_CFLAGS $LIBDBI_CFLAGS $IVYKIS_CFLAGS -D_GNU_SOURCE -D_DEFAULT_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
|
|
|
|
########################################################
|
|
## NOTES: on how syslog-ng is linked
|
|
@@ -1640,7 +1648,7 @@
|
|
MODULE_DEPS_LIBS="\$(top_builddir)/lib/libsyslog-ng.la"
|
|
|
|
if test "x$linking_mode" = "xdynamic"; then
|
|
- SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $DL_LIBS"
|
|
+ SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $SECRET_STORAGE_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $DL_LIBS"
|
|
|
|
if test "x$with_ivykis" = "xinternal"; then
|
|
# when using the internal ivykis, we're linking it statically into libsyslog-ng.so
|
|
@@ -1659,8 +1667,8 @@
|
|
# syslog-ng binary is linked with the default link command (e.g. libtool)
|
|
SYSLOGNG_LINK='$(LINK)'
|
|
else
|
|
- SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_NO_LIBTOOL_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,${NO_WHOLE_ARCHIVE_OPT} $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS"
|
|
- TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS"
|
|
+ SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_NO_LIBTOOL_LIBS $SECRET_STORAGE_NO_LIBTOOL_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,${NO_WHOLE_ARCHIVE_OPT} $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS"
|
|
+ TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $SECRET_STORAGE_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS"
|
|
CORE_DEPS_LIBS=""
|
|
|
|
# bypass libtool in case we want to do mixed linking because it
|
|
Only in syslog-ng-3.16.1-vanilla/: syslog-ng-3.16.1
|