1 diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/configure.ac syslog-ng-syslog-ng-3.14.1/configure.ac
2 --- syslog-ng-syslog-ng-3.14.1.orig/configure.ac 2018-04-03 09:50:19.000000000 +0200
3 +++ syslog-ng-syslog-ng-3.14.1/configure.ac 2018-04-03 09:51:38.000000000 +0200
5 dnl ***************************************************************************
7 EVTLOG_LIBS="\$(top_builddir)/lib/eventlog/src/libevtlog.la"
8 -EVTLOG_NO_LIBTOOL_LIBS="\$(top_builddir)/lib/eventlog/src/.libs/libevtlog.la"
9 +EVTLOG_NO_LIBTOOL_LIBS="\$(top_builddir)/lib/eventlog/src/.libs/libevtlog.so"
10 EVTLOG_CFLAGS="-I\$(top_srcdir)/lib/eventlog/src -I\$(top_builddir)/lib/eventlog/src"
12 dnl ***************************************************************************
14 # syslog-ng binary is linked with the default link command (e.g. libtool)
15 SYSLOGNG_LINK='$(LINK)'
17 - SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC -Wl,${WHOLE_ARCHIVE_OPT} $GLIB_LIBS $EVTLOG_NO_LIBTOOL_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,${NO_WHOLE_ARCHIVE_OPT} $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS "
18 + 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} $LD_END_STATIC $IVYKIS_LIBS $LIBCAP_LIBS $DL_LIBS "
19 TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS"
21 + CORE_DEPS_LIBS="$IVYKIS_LIBS"
23 # bypass libtool in case we want to do mixed linking because it
24 # doesn't support -Wl,-Bstatic -Wl,-Bdynamic on a per-library basis.
25 diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/lib/logproto/tests/Makefile.am syslog-ng-syslog-ng-3.14.1/lib/logproto/tests/Makefile.am
26 --- syslog-ng-syslog-ng-3.14.1.orig/lib/logproto/tests/Makefile.am 2018-02-26 15:32:28.000000000 +0100
27 +++ syslog-ng-syslog-ng-3.14.1/lib/logproto/tests/Makefile.am 2018-04-03 09:50:43.000000000 +0200
30 -I${top_srcdir}/libtest
31 lib_logproto_tests_test_findeom_LDADD = \
32 - ${top_builddir}/lib/libsyslog-ng.la \
34 ${top_builddir}/libtest/libsyslog-ng-test.a
35 lib_logproto_tests_test_findeom_SOURCES = \
36 lib/logproto/tests/test_findeom.c
37 diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/modules/diskq/Makefile.am syslog-ng-syslog-ng-3.14.1/modules/diskq/Makefile.am
38 --- syslog-ng-syslog-ng-3.14.1.orig/modules/diskq/Makefile.am 2018-02-26 15:32:28.000000000 +0100
39 +++ syslog-ng-syslog-ng-3.14.1/modules/diskq/Makefile.am 2018-04-03 09:50:43.000000000 +0200
42 modules_diskq_dqtool_SOURCES = modules/diskq/dqtool.c
43 modules_diskq_dqtool_LDADD = \
47 $(LIBSYSLOG_NG_DISK_BUFFER)
49 modules/diskq modules/diskq/ mod-diskq: modules/diskq/libdisk-buffer.la \
50 diff -dur -x '*.orig' syslog-ng-syslog-ng-3.14.1.orig/syslog-ng-ctl/Makefile.am syslog-ng-syslog-ng-3.14.1/syslog-ng-ctl/Makefile.am
51 --- syslog-ng-syslog-ng-3.14.1.orig/syslog-ng-ctl/Makefile.am 2018-02-26 15:32:28.000000000 +0100
52 +++ syslog-ng-syslog-ng-3.14.1/syslog-ng-ctl/Makefile.am 2018-04-03 09:50:43.000000000 +0200
55 syslog-ng-ctl/control-client-unix.c
57 -syslog_ng_ctl_syslog_ng_ctl_LDADD = lib/libsyslog-ng.la @BASE_LIBS@ @GLIB_LIBS@ @RESOLV_LIBS@
59 +syslog_ng_ctl_syslog_ng_ctl_DEPENDENCIES = lib/libsyslog-ng.la
60 +syslog_ng_ctl_syslog_ng_ctl_LDADD = -L${top_builddir}/lib/.libs -lsyslog-ng @SYSLOGNG_DEPS_LIBS@
61 +syslog_ng_ctl_syslog_ng_ctl_LINK = @SYSLOGNG_LINK@