diff options
| author | Michael Biebl <biebl@debian.org> | 2013-04-25 22:45:00 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-26 15:38:16 +0200 |
| commit | 0cb6b47661c6d62149337249035edfea368c6b86 (patch) | |
| tree | fda9618361beba4df6b83d85a053281485d8631f /tools | |
| parent | 0d8d9d779190b95b8fbbb2669aa4f65e917e466d (diff) | |
| download | rsyslog-0cb6b47661c6d62149337249035edfea368c6b86.tar.gz rsyslog-0cb6b47661c6d62149337249035edfea368c6b86.tar.bz2 rsyslog-0cb6b47661c6d62149337249035edfea368c6b86.zip | |
build: fix build if libgcrypt support is disabled
We don't want to hard-code `libgcrypt-config --libs` at various.
Also, make sure LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS are correctly
substituted.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index c600d6de..4fdbc2d8 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -40,9 +40,8 @@ rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) # note: it looks like librsyslog.la must be explicitely given on LDDADD, # otherwise dependencies are not properly calculated (resulting in a # potentially incomplete build, a problem we had several times...) -rsyslogd_LDADD = ../grammar/libgrammar.la ../runtime/librsyslog.la $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBEE_LIBS) $(LIBLOGNORM_LIBS) $(LIBUUID_LIBS) -rsyslogd_LDFLAGS = -export-dynamic `libgcrypt-config --libs` -#rsyslogd_LDFLAGS = -export-dynamic $(LIBGCRYPT_LIBS) +rsyslogd_LDADD = ../grammar/libgrammar.la ../runtime/librsyslog.la $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBEE_LIBS) $(LIBLOGNORM_LIBS) $(LIBUUID_LIBS) $(LIBGCRYPT_LIBS) +rsyslogd_LDFLAGS = -export-dynamic EXTRA_DIST = $(man_MANS) \ rsgtutil.rst \ @@ -79,7 +78,6 @@ if ENABLE_LIBGCRYPT bin_PROGRAMS += rscryutil rscryutil = rscryutil.c rscryutil_CPPFLAGS = -I../runtime $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS) -rscryutil_LDFLAGS = `libgcrypt-config --libs` rscryutil_LDADD = ../runtime/libgcry.la $(LIBGCRYPT_LIBS) rscryutil.1: rscryutil.rst $(AM_V_GEN) $(RST2MAN) $< $@ |