73 lines
2.7 KiB
Diff
73 lines
2.7 KiB
Diff
--- runtime/Makefile.am.orig 2012-01-14 10:20:51.235371487 +0100
|
|
+++ runtime/Makefile.am 2012-01-14 10:22:02.857662520 +0100
|
|
@@ -115,7 +115,7 @@ else
|
|
librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I$(top_srcdir) $(PTHREADS_CFLAGS) $(LIBEE_CFLAGS)
|
|
endif
|
|
#librsyslog_la_LDFLAGS = -module -avoid-version
|
|
-librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBEE_LIBS)
|
|
+librsyslog_la_LIBADD = $(DL_LIBS) $(RT_LIBS) $(LIBESTR_LIBS) $(LIBEE_LIBS)
|
|
|
|
#
|
|
# regular expression support
|
|
@@ -125,7 +125,7 @@ pkglib_LTLIBRARIES += lmregexp.la
|
|
lmregexp_la_SOURCES = regexp.c regexp.h
|
|
lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
|
|
lmregexp_la_LDFLAGS = -module -avoid-version
|
|
-lmregexp_la_LIBADD =
|
|
+lmregexp_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS)
|
|
endif
|
|
|
|
#
|
|
@@ -136,7 +136,7 @@ pkglib_LTLIBRARIES += lmzlibw.la
|
|
lmzlibw_la_SOURCES = zlibw.c zlibw.h
|
|
lmzlibw_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
|
|
lmzlibw_la_LDFLAGS = -module -avoid-version
|
|
-lmzlibw_la_LIBADD =
|
|
+lmzlibw_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS) $(ZLIB_LIBS)
|
|
endif
|
|
|
|
if ENABLE_INET
|
|
@@ -147,7 +147,7 @@ pkglib_LTLIBRARIES += lmnet.la lmnetstrm
|
|
lmnet_la_SOURCES = net.c net.h
|
|
lmnet_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
|
|
lmnet_la_LDFLAGS = -module -avoid-version
|
|
-lmnet_la_LIBADD =
|
|
+lmnet_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS)
|
|
|
|
# network stream master class and stream factory
|
|
lmnetstrms_la_SOURCES = netstrms.c netstrms.h \
|
|
@@ -156,14 +156,14 @@ lmnetstrms_la_SOURCES = netstrms.c netst
|
|
nspoll.c nspoll.h
|
|
lmnetstrms_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
|
|
lmnetstrms_la_LDFLAGS = -module -avoid-version
|
|
-lmnetstrms_la_LIBADD =
|
|
+lmnetstrms_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS)
|
|
|
|
# generic stream server framework
|
|
pkglib_LTLIBRARIES += lmstrmsrv.la
|
|
lmstrmsrv_la_SOURCES = strmsrv.c strmsrv.h strms_sess.c strms_sess.h
|
|
lmstrmsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
|
|
lmstrmsrv_la_LDFLAGS = -module -avoid-version
|
|
-lmstrmsrv_la_LIBADD =
|
|
+lmstrmsrv_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS)
|
|
|
|
# netstream drivers
|
|
|
|
@@ -174,7 +174,7 @@ lmnsd_ptcp_la_SOURCES = nsd_ptcp.c nsd_p
|
|
nsdpoll_ptcp.c nsdpoll_ptcp.h
|
|
lmnsd_ptcp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
|
|
lmnsd_ptcp_la_LDFLAGS = -module -avoid-version
|
|
-lmnsd_ptcp_la_LIBADD =
|
|
+lmnsd_ptcp_la_LIBADD = $(PTHREADS_LIBS) $(RSRT_LIBS)
|
|
endif # if ENABLE_INET
|
|
|
|
#
|
|
@@ -185,7 +185,7 @@ pkglib_LTLIBRARIES += lmnsd_gtls.la
|
|
lmnsd_gtls_la_SOURCES = nsd_gtls.c nsd_gtls.h nsdsel_gtls.c nsdsel_gtls.h
|
|
lmnsd_gtls_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(GNUTLS_CFLAGS)
|
|
lmnsd_gtls_la_LDFLAGS = -module -avoid-version
|
|
-lmnsd_gtls_la_LIBADD = $(GNUTLS_LIBS)
|
|
+lmnsd_gtls_la_LIBADD = $(GNUTLS_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS)
|
|
endif
|
|
|
|
update-systemd:
|