- fix glib detection; properly link syslog-ng.so to glib and eventlog

Changed files:
    syslog-ng-link.patch -> 1.9

diff --git a/syslog-ng-link.patch b/syslog-ng-link.patch
index 56ccb707d267dec2d6311204b7e2ad1cea73524f..9d7cc0305f405df6bd241b0985c1e66de8d970a8 100644 (file)
--- a/syslog-ng-link.patch
+++ b/syslog-ng-link.patch
@@ -31,3 +31,25 @@
  
  module_LTLIBRARIES = libdbparser.la
  libdbparser_la_SOURCES = \
+--- syslog-ng-3.2.2/configure.in~      2011-02-23 08:46:17.152179679 +0100
++++ syslog-ng-3.2.2/configure.in       2011-02-23 08:53:26.506748469 +0100
+@@ -458,7 +458,7 @@
+       GLIB_LIBS=`echo $GLIB_LIBS | tr ' ' '\n' | egrep -v "^(-ldld?)|(-lrt)$" | tr '\n' ' '`
+ 
+       old_LIBS=$LIBS
+-      LIBS="$LD_START_STATIC $GLIB_LIBS $LD_END_STATIC"
++      LIBS="$LD_START_STATIC $GLIB_LIBS $LD_END_STATIC -ldl -lrt"
+       AC_CHECK_FUNC(g_hash_table_new, blb_cv_static_glib=yes, blb_cv_static_glib=no)
+       LIBS=$old_LIBS
+ fi
+--- syslog-ng-3.2.2/configure.in~      2011-02-23 08:53:58.767670120 +0100
++++ syslog-ng-3.2.2/configure.in       2011-02-23 09:02:25.059826526 +0100
+@@ -675,7 +675,7 @@
+       SYSLOGNG_LINK='$(LINK)'
+ else
+       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 "
+-      CORE_DEPS_LIBS=""
++      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"
+       # bypass libtool in case we want to do mixel linking
+       SYSLOGNG_LINK='$(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@'
+ fi