* [gentoo-commits] gentoo-x86 commit in net-analyzer/nagios-plugins/files: nagios-plugins-1.4.15-openldap.patch
@ 2011-02-22 23:30 Markos Chandras (hwoarang)
0 siblings, 0 replies; 2+ messages in thread
From: Markos Chandras (hwoarang) @ 2011-02-22 23:30 UTC (permalink / raw
To: gentoo-commits
hwoarang 11/02/22 23:30:40
Added: nagios-plugins-1.4.15-openldap.patch
Log:
Fix openldap automagic dependency. Bug #336973
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
Revision Changes Path
1.1 net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch?rev=1.1&content-type=text/plain
Index: nagios-plugins-1.4.15-openldap.patch
===================================================================
Index: nagios-plugins-1.4.15/configure.in
===================================================================
--- nagios-plugins-1.4.15.orig/configure.in
+++ nagios-plugins-1.4.15/configure.in
@@ -257,23 +257,6 @@ fi
LIBS="$_SAVEDLIBS"
CPPFLAGS="$_SAVEDCPPFLAGS"
-dnl Check for LDAP libraries
-_SAVEDLIBS="$LIBS"
-AC_CHECK_LIB(ldap,main,,,-llber)
-if test "$ac_cv_lib_ldap_main" = "yes"; then
- LDAPLIBS="-lldap -llber"\
- LDAPINCLUDE="-I/usr/include/ldap"
- AC_SUBST(LDAPLIBS)
- AC_SUBST(LDAPINCLUDE)
- AC_CHECK_FUNCS(ldap_set_option)
- EXTRAS="$EXTRAS check_ldap"
- AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
-else
- AC_MSG_WARN([Skipping LDAP plugin])
- AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
-fi
-LIBS="$_SAVEDLIBS"
-
dnl Check for headers used by check_ide_smart
AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
if test "$FOUNDINCLUDE" = "yes" ; then
@@ -305,6 +288,8 @@ fi
AC_ARG_WITH([ipv6],
[AS_HELP_STRING([--with-ipv6], [support IPv6 @<:@default=check@:>@])],
[], [with_ipv6=check])
+AC_ARG_WITH([ldap],[AS_HELP_STRING([--with-ldap], [support Openldap @<:@default=check@:>@])],
+ [], [with_ldap=check])
dnl Check for AF_INET6 support - unistd.h required for Darwin
if test "$with_ipv6" != "no"; then
@@ -333,6 +318,24 @@ if test "$with_ipv6" != "no"; then
with_ipv6="$np_cv_sys_ipv6"
fi
+dnl Check for LDAP libraries
+if test "$with_ldap" != "no"; then
+
+ _SAVEDLIBS="$LIBS"
+ AC_CHECK_LIB(ldap,main,[:],,-llber)
+ if test "$ac_cv_lib_ldap_main" = "yes"; then
+ LDAPLIBS="-lldap -llber"\
+ LDAPINCLUDE="-I/usr/include/ldap"
+ AC_SUBST(LDAPLIBS)
+ AC_SUBST(LDAPINCLUDE)
+ AC_CHECK_FUNCS(ldap_set_option)
+ EXTRAS="$EXTRAS check_ldap"
+ AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
+ else
+ AC_MSG_ERROR([Cannot find openldap libraries.])
+ fi
+fi
+LIBS="$_SAVEDLIBS"
dnl Checks for Kerberos. Must come before openssl checks for Redhat EL 3
AC_CHECK_HEADERS(krb5.h,FOUNDINCLUDE=yes,FOUNDINCLUDE=no)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-analyzer/nagios-plugins/files: nagios-plugins-1.4.15-openldap.patch
@ 2011-04-29 21:00 Markos Chandras (hwoarang)
0 siblings, 0 replies; 2+ messages in thread
From: Markos Chandras (hwoarang) @ 2011-04-29 21:00 UTC (permalink / raw
To: gentoo-commits
hwoarang 11/04/29 21:00:36
Modified: nagios-plugins-1.4.15-openldap.patch
Log:
Fix openldap patch thanks to Frieder Bürzele <evermind@tuxfamily.org>. Bug #336973
(Portage version: 2.1.9.44/cvs/Linux x86_64)
Revision Changes Path
1.2 net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch?r1=1.1&r2=1.2
Index: nagios-plugins-1.4.15-openldap.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nagios-plugins-1.4.15-openldap.patch 22 Feb 2011 23:30:40 -0000 1.1
+++ nagios-plugins-1.4.15-openldap.patch 29 Apr 2011 21:00:36 -0000 1.2
@@ -43,7 +43,7 @@
+if test "$with_ldap" != "no"; then
+
+ _SAVEDLIBS="$LIBS"
-+ AC_CHECK_LIB(ldap,main,[:],,-llber)
++ AC_CHECK_LIB(ldap,main,,,-llber)
+ if test "$ac_cv_lib_ldap_main" = "yes"; then
+ LDAPLIBS="-lldap -llber"\
+ LDAPINCLUDE="-I/usr/include/ldap"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-29 21:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-22 23:30 [gentoo-commits] gentoo-x86 commit in net-analyzer/nagios-plugins/files: nagios-plugins-1.4.15-openldap.patch Markos Chandras (hwoarang)
-- strict thread matches above, loose matches on Subject: below --
2011-04-29 21:00 Markos Chandras (hwoarang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox