Attachment #219957 for bug #305449

Lines 1093-1098 if test "x$want_ldap" = "xyes"; then Link Here

(-)zabbix-1.8.orig//configure.in (+2 lines)
1093	fi	1093	fi
1094	CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}"	1094	CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}"
1095	LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}"	1095	LDFLAGS="${LDFLAGS} ${LDAP_LDFLAGS}"
		1096	LIBS="${LIBS} ${LDAP_LIBS}"
1096		1097
1097	found_iconv="no"	1098	found_iconv="no"
1098	dnl Check for libiconv [by default - skip]	1099	dnl Check for libiconv [by default - skip]
Lines 1116-1121 if test "x$want_openipmi" = "xyes"; then Link Here
1116	fi	1117	fi
1117	CFLAGS="${CFLAGS} ${OPENIPMI_CPPFLAGS}"	1118	CFLAGS="${CFLAGS} ${OPENIPMI_CPPFLAGS}"
1118	LDFLAGS="${LDFLAGS} ${OPENIPMI_LDFLAGS}"	1119	LDFLAGS="${LDFLAGS} ${OPENIPMI_LDFLAGS}"
		1120	LIBS="${LIBS} ${OPENIPMI_LIBS}"
1119		1121
1120	RANLIB="ranlib"	1122	RANLIB="ranlib"
1121	AC_SUBST(RANLIB)	1123	AC_SUBST(RANLIB)

Lines 72-78 AC_HELP_STRING([--with-ldap@<:@=DIR@:>@] Link Here

(-)zabbix-1.8.orig//m4/ldap.m4 (-1 / +3 lines)
72	fi	72	fi
73		73
74	LDAP_CPPFLAGS=-I$LDAP_INCDIR	74	LDAP_CPPFLAGS=-I$LDAP_INCDIR
75	LDAP_LDFLAGS="-L$LDAP_LIBDIR -lldap $LDAP_LIBS"	75	LDAP_LDFLAGS="-L$LDAP_LIBDIR"
		76	LDAP_LIBS="-lldap $LDAP_LIBS"
76		77
77	found_ldap="yes"	78	found_ldap="yes"
78	AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.])	79	AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.])
Lines 91-96 AC_HELP_STRING([--with-ldap@<:@=DIR@:>@] Link Here
91		92
92	AC_SUBST(LDAP_CPPFLAGS)	93	AC_SUBST(LDAP_CPPFLAGS)
93	AC_SUBST(LDAP_LDFLAGS)	94	AC_SUBST(LDAP_LDFLAGS)
		95	AC_SUBST(LDAP_LIBS)
94		96
95	unset _libldap_with	97	unset _libldap_with
96	])dnl	98	])dnl




#               fi

               OPENIPMI_CPPFLAGS=-I$OPENIPMI_INCDIR
               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.])

  fi

  AC_SUBST(OPENIPMI_CPPFLAGS)
  AC_SUBST(OPENIPMI_LDFLAGS)
  AC_SUBST(OPENIPMI_LIBS)

  unset _libopenipmi_with
])dnl

Return to bug 305449

Lines 68-74 AC_HELP_STRING([--with-openipmi@<:@=DIR@ Link Here

(-)zabbix-1.8.orig//m4/openipmi.m4 (-2 / +4 lines)
68	# fi	68	# fi
69		69
70	OPENIPMI_CPPFLAGS=-I$OPENIPMI_INCDIR	70	OPENIPMI_CPPFLAGS=-I$OPENIPMI_INCDIR
71	OPENIPMI_LDFLAGS="-L$OPENIPMI_LIBDIR -lOpenIPMI -lOpenIPMIposix"	71	OPENIPMI_LDFLAGS="-L$OPENIPMI_LIBDIR"
		72	OPENIPMI_LIBS="-lOpenIPMI -lOpenIPMIposix"
72		73
73	found_openipmi="yes"	74	found_openipmi="yes"
74	AC_DEFINE(HAVE_OPENIPMI,1,[Define to 1 if OPENIPMI should be enabled.])	75	AC_DEFINE(HAVE_OPENIPMI,1,[Define to 1 if OPENIPMI should be enabled.])
Lines 85-91 AC_HELP_STRING([--with-openipmi@<:@=DIR@ Link Here
85	fi	86	fi
86		87
87	AC_SUBST(OPENIPMI_CPPFLAGS)	88	AC_SUBST(OPENIPMI_CPPFLAGS)
88	AC_SUBST(OPENIPMOPENIPMIFLAGS)	89	AC_SUBST(OPENIPMI_LDFLAGS)
		90	AC_SUBST(OPENIPMI_LIBS)
89		91
90	unset _libopenipmi_with	92	unset _libopenipmi_with
91	])dnl	93	])dnl