diff options
| author | Michael Biebl <mbiebel@gmail.com> | 2008-04-16 08:33:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 08:33:12 +0200 |
| commit | 3285f4391000b40b7c8adead2e2999de15ff8da0 (patch) | |
| tree | 040289e87608e06d92d68f4883a99c044d6e970f | |
| parent | 4226f0dd4813277819406a4f13b460195d798f1a (diff) | |
| download | rsyslog-3285f4391000b40b7c8adead2e2999de15ff8da0.tar.gz rsyslog-3285f4391000b40b7c8adead2e2999de15ff8da0.tar.xz rsyslog-3285f4391000b40b7c8adead2e2999de15ff8da0.zip | |
made runtime include directory available to rest of rsyslog
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 28e960e6..58c66cef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,3 @@ -#sbin_PROGRAMS = rfc3195d rsyslogd sbin_PROGRAMS = man_MANS = @@ -90,8 +89,8 @@ rsyslogd_SOURCES = \ action.h \ atomic.h -rsyslogd_CPPFLAGS = -D_PATH_MODDIR=\"$(pkglibdir)/\" $(pthreads_cflags) -rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(dl_libs) $(rt_libs) runtime/librsyslog.la +rsyslogd_CPPFLAGS = -D_PATH_MODDIR=\"$(pkglibdir)/\" $(pthreads_cflags) $(rsrt_cflags) +rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(dl_libs) $(rt_libs) $(rsrt_libs) rsyslogd_LDFLAGS = -export-dynamic man_MANS += rsyslogd.8 rsyslog.conf.5 @@ -115,8 +114,8 @@ pkglib_LTLIBRARIES += lmnet.la lmtcpsrv.la lmtcpclt.la # network support # lmnet_la_SOURCES = net.c net.h -lmnet_la_CPPFLAGS = $(pthreads_cflags) -lmnet_la_LDFLAGS = -module -avoid-version +lmnet_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags) +lmnet_la_LDFLAGS = -module -avoid-version $(rsrt_libs) lmnet_la_LIBADD = # # diff --git a/configure.ac b/configure.ac index 9675a9b5..b0cc3e2e 100644 --- a/configure.ac +++ b/configure.ac @@ -508,9 +508,11 @@ AC_ARG_ENABLE(rsyslogrt, esac], [enable_rsyslogrt=yes] ) +if test "x$enable_rsyslogrt" = "xyes"; then + rsrt_cflags="-I\$(top_srcdir)/runtime -I\$(top_srcdir)" + rsrt_libs="\$(top_builddir)/runtime/librsyslog.la" +fi AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes) -CFLAGS="-I$(top_srcdir)/runtime $CFLAGS$ -rsrt_libs="" AC_SUBST(rsrt_cflags) AC_SUBST(rsrt_libs) |