[patch] zabbix-as-needed.patch

zabbix-as-needed.patch (text/plain), 2.24 KB, created by Yuri Vasilevski (RETIRED) on 2010-02-17 03:38:35 UTC

diff -Naurp zabbix-1.8.orig//configure.in zabbix-1.8/configure.in
--- zabbix-1.8.orig//configure.in	2009-12-07 13:43:58.000000000 -0600
+++ zabbix-1.8/configure.in	2010-02-16 15:23:47.975288173 -0600
@@ -1093,6 +1093,7 @@ if test "x$want_ldap" = "xyes"; then
 fi
 CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}"
 LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}"
+LIBS="${LIBS} ${LDAP_LIBS}"
 
 found_iconv="no"
 dnl Check for libiconv [by default - skip]
@@ -1116,6 +1117,7 @@ if test "x$want_openipmi" = "xyes"; then
 fi
 CFLAGS="${CFLAGS} ${OPENIPMI_CPPFLAGS}"
 LDFLAGS="${LDFLAGS} ${OPENIPMI_LDFLAGS}"
+LIBS="${LIBS} ${OPENIPMI_LIBS}"
 
 RANLIB="ranlib"
 AC_SUBST(RANLIB)
diff -Naurp zabbix-1.8.orig//m4/ldap.m4 zabbix-1.8/m4/ldap.m4
--- zabbix-1.8.orig//m4/ldap.m4	2009-12-07 13:43:56.000000000 -0600
+++ zabbix-1.8/m4/ldap.m4	2010-02-16 15:19:53.961978203 -0600
@@ -72,7 +72,8 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@]
                fi
 
                LDAP_CPPFLAGS=-I$LDAP_INCDIR
-               LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap $LDAP_LIBS"
+               LDAP_LDFLAGS="-L$LDAP_LIBDIR"
+               LDAP_LIBS="-lldap $LDAP_LIBS"
 
                found_ldap="yes"
                AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.])
@@ -91,6 +92,7 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@]
 
   AC_SUBST(LDAP_CPPFLAGS)
   AC_SUBST(LDAP_LDFLAGS)
+  AC_SUBST(LDAP_LIBS)
 
   unset _libldap_with
 ])dnl
diff -Naurp zabbix-1.8.orig//m4/openipmi.m4 zabbix-1.8/m4/openipmi.m4
--- zabbix-1.8.orig//m4/openipmi.m4	2009-12-07 13:43:56.000000000 -0600
+++ zabbix-1.8/m4/openipmi.m4	2010-02-16 15:21:53.618633050 -0600
@@ -68,7 +68,8 @@ AC_HELP_STRING([--with-openipmi@<:@=DIR@
 #               fi
 
                OPENIPMI_CPPFLAGS=-I$OPENIPMI_INCDIR
-               OPENIPMI_LDFLAGS="-L$OPENIPMI_LIBDIR -lOpenIPMI -lOpenIPMIposix"
+               OPENIPMI_LDFLAGS="-L$OPENIPMI_LIBDIR"
+               OPENIPMI_LIBS="-lOpenIPMI -lOpenIPMIposix"
 
                found_openipmi="yes"
                AC_DEFINE(HAVE_OPENIPMI,1,[Define to 1 if OPENIPMI should be enabled.])
@@ -85,7 +86,8 @@ AC_HELP_STRING([--with-openipmi@<:@=DIR@
   fi
 
   AC_SUBST(OPENIPMI_CPPFLAGS)
-  AC_SUBST(OPENIPMOPENIPMIFLAGS)
+  AC_SUBST(OPENIPMI_LDFLAGS)
+  AC_SUBST(OPENIPMI_LIBS)
 
   unset _libopenipmi_with
 ])dnl