diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | runtime/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 81efe365..cba1b80a 100644 --- a/configure.ac +++ b/configure.ac @@ -804,6 +804,8 @@ if test "x$enable_libgcrypt" = "xyes"; then AC_DEFINE([ENABLE_LIBGCRYPT], [1], [Indicator that LIBGCRYPT is present]) fi AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes) +AC_SUBST(LIBGCRYPT_CFLAGS) +AC_SUBST(LIBGCRYPT_LIBS) # support for building the rsyslogd runtime diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 3015c3ca..fe4afb09 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -185,7 +185,7 @@ if ENABLE_LIBGCRYPT pkglib_LTLIBRARIES += lmcry_gcry.la lmcry_gcry_la_SOURCES = lmcry_gcry.c lmcry_gcry.h lmcry_gcry_la_CPPFLAGS = $(RSRT_CFLAGS) $(LIBGCRYPT_CFLAGS) - lmcry_gcry_la_LDFLAGS = -module -avoid-version `libgcrypt-config --libs` + lmcry_gcry_la_LDFLAGS = -module -avoid-version lmcry_gcry_la_LIBADD = libgcry.la $(LIBGCRYPT_LIBS) endif 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) $< $@ |