diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-22 09:27:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-22 09:27:53 +0200 |
| commit | 5ecb71776b517b19bc94c8ae688e842bed6e3f53 (patch) | |
| tree | 32998a09eb282a83dbd95cadc1c297437398f195 | |
| parent | be804fecf0e383e2b9c4fa646bcd838f1d2545ef (diff) | |
| download | rsyslog-5ecb71776b517b19bc94c8ae688e842bed6e3f53.tar.gz rsyslog-5ecb71776b517b19bc94c8ae688e842bed6e3f53.tar.xz rsyslog-5ecb71776b517b19bc94c8ae688e842bed6e3f53.zip | |
build system cleanup/improvement
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | tools/Makefile.am | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 48e6a94e..46c50bbf 100644 --- a/configure.ac +++ b/configure.ac @@ -17,12 +17,6 @@ AC_GNU_SOURCE AC_CHECK_PROG(have_valgrind, [valgrind], [yes]) AM_CONDITIONAL(HAVE_VALGRIND, test x$have_valgrind = xyes) -# check for Java compiler -AC_CHECK_PROG(HAVE_JAVAC, [javac], [yes]) -if test x"$HAVE_JAVAC" = x""; then - AC_MSG_WARN([no javac found, disabling features depending on it]) -fi - # Checks for programs. AC_PROG_LEX AC_PROG_YACC diff --git a/tools/Makefile.am b/tools/Makefile.am index 1bed5ae8..84b0b6f0 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -34,7 +34,8 @@ rsyslogd_SOURCES = \ pidfile.c \ pidfile.h \ \ - ../dirty.h + ../dirty.h \ + ../runtime/librsyslog.la rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(CNF_LIBS) rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBEE_LIBS) $(LIBLOGNORM_LIBS) $(CNF_LIBS) ../grammar/libgrammar.la rsyslogd_LDFLAGS = -export-dynamic |