projects / packages / syslog-ng.git / blame
| Commit | Line | Data |
|---|---|---|
| 9c408153 JB |
1 | --- syslog-ng-2.0.3/configure.in.orig 2007-03-04 10:58:00.000000000 +0100 |
| 2 | +++ syslog-ng-2.0.3/configure.in 2007-04-03 23:53:53.219462987 +0200 | |
| f48fd9d2 JR |
3 | @@ -265,9 +265,8 @@ |
| 4 | AC_CHECK_LIB(door, door_create, BASE_LIBS="$BASE_LIBS -ldoor") | |
| 5 | AC_CHECK_LIB(socket, socket, BASE_LIBS="$BASE_LIBS -lsocket") | |
| 6 | AC_CHECK_LIB(rt, nanosleep, BASE_LIBS="$BASE_LIBS -lrt") | |
| 7 | -AC_CHECK_LIB(nsl, gethostbyname, BASE_LIBS="$BASE_LIBS -lnsl") | |
| 8 | +AC_CHECK_LIB(resolv, gethostbyname, BASE_LIBS="$BASE_LIBS -lresolv") | |
| 9 | AC_CHECK_LIB(regex, regexec, REGEX_LIBS="-lregex") | |
| 10 | -AC_CHECK_LIB(resolv, res_init, RESOLV_LIBS="-lresolv") | |
| 33e9c834 | 11 | |
| f48fd9d2 JR |
12 | if test "x$enable_linux_caps" = "xyes" -o "x$enable_linux_caps" = "xauto"; then |
| 13 | AC_CHECK_LIB(cap, cap_set_proc, LIBCAP_LIBS="-lcap") | |
| 4ffa4134 JR |
14 | @@ -674,7 +674,7 @@ |
| 15 | CORE_DEPS_LIBS="$DEPS_LIBS" | |
| 16 | SYSLOGNG_LINK='$(LINK)' | |
| 17 | else | |
| 18 | - DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,--no-whole-archive $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS " | |
| 19 | + DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,--no-whole-archive $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS -lrt " | |
| 20 | CORE_DEPS_LIBS="" | |
| 21 | # bypass libtool in case we want to do mixel linking | |
| 22 | SYSLOGNG_LINK='$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@' | |
| 1fe2e76c AM |
23 | --- syslog-ng-3.2.2/modules/dbparser/Makefile.am~ 2011-01-15 17:14:39.000000000 +0100 |
| 24 | +++ syslog-ng-3.2.2/modules/dbparser/Makefile.am 2011-01-17 20:06:00.103986725 +0100 | |
| 25 | @@ -17,7 +17,7 @@ | |
| 26 | timerwheel.c timerwheel.h \ | |
| 27 | patternize.c patternize.h | |
| 28 | libsyslog_ng_patterndb_la_LDFLAGS = -no-undefined | |
| 29 | -libsyslog_ng_patterndb_la_LIBADD = @OPENSSL_LIBS@ @DEPS_LIBS@ | |
| 30 | +libsyslog_ng_patterndb_la_LIBADD = $(top_builddir)/lib/libsyslog-ng.la @OPENSSL_LIBS@ @DEPS_LIBS@ | |
| 31 | ||
| 32 | module_LTLIBRARIES = libdbparser.la | |
| 33 | libdbparser_la_SOURCES = \ | |
| cd3e7332 AM |
34 | --- syslog-ng-3.2.2/configure.in~ 2011-02-23 08:46:17.152179679 +0100 |
| 35 | +++ syslog-ng-3.2.2/configure.in 2011-02-23 08:53:26.506748469 +0100 | |
| 36 | @@ -458,7 +458,7 @@ | |
| 37 | GLIB_LIBS=`echo $GLIB_LIBS | tr ' ' '\n' | egrep -v "^(-ldld?)|(-lrt)$" | tr '\n' ' '` | |
| 38 | ||
| 39 | old_LIBS=$LIBS | |
| 40 | - LIBS="$LD_START_STATIC $GLIB_LIBS $LD_END_STATIC" | |
| 41 | + LIBS="$LD_START_STATIC $GLIB_LIBS $LD_END_STATIC -ldl -lrt" | |
| 42 | AC_CHECK_FUNC(g_hash_table_new, blb_cv_static_glib=yes, blb_cv_static_glib=no) | |
| 43 | LIBS=$old_LIBS | |
| 44 | fi | |
| 45 | --- syslog-ng-3.2.2/configure.in~ 2011-02-23 08:53:58.767670120 +0100 | |
| 46 | +++ syslog-ng-3.2.2/configure.in 2011-02-23 09:02:25.059826526 +0100 | |
| 47 | @@ -675,7 +675,7 @@ | |
| 48 | SYSLOGNG_LINK='$(LINK)' | |
| 49 | else | |
| 50 | DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,--no-whole-archive $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS -lrt " | |
| 51 | - CORE_DEPS_LIBS="" | |
| 52 | + CORE_DEPS_LIBS="$LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS -Wl,--no-whole-archive $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS -lrt" | |
| 53 | # bypass libtool in case we want to do mixel linking | |
| 54 | SYSLOGNG_LINK='$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@' | |
| 55 | fi |