| 1 |
hwoarang 11/02/22 23:30:40 |
| 2 |
|
| 3 |
Added: nagios-plugins-1.4.15-openldap.patch |
| 4 |
Log: |
| 5 |
Fix openldap automagic dependency. Bug #336973 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-analyzer/nagios-plugins/files/nagios-plugins-1.4.15-openldap.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: nagios-plugins-1.4.15-openldap.patch |
| 16 |
=================================================================== |
| 17 |
Index: nagios-plugins-1.4.15/configure.in |
| 18 |
=================================================================== |
| 19 |
--- nagios-plugins-1.4.15.orig/configure.in |
| 20 |
+++ nagios-plugins-1.4.15/configure.in |
| 21 |
@@ -257,23 +257,6 @@ fi |
| 22 |
LIBS="$_SAVEDLIBS" |
| 23 |
CPPFLAGS="$_SAVEDCPPFLAGS" |
| 24 |
|
| 25 |
-dnl Check for LDAP libraries |
| 26 |
-_SAVEDLIBS="$LIBS" |
| 27 |
-AC_CHECK_LIB(ldap,main,,,-llber) |
| 28 |
-if test "$ac_cv_lib_ldap_main" = "yes"; then |
| 29 |
- LDAPLIBS="-lldap -llber"\ |
| 30 |
- LDAPINCLUDE="-I/usr/include/ldap" |
| 31 |
- AC_SUBST(LDAPLIBS) |
| 32 |
- AC_SUBST(LDAPINCLUDE) |
| 33 |
- AC_CHECK_FUNCS(ldap_set_option) |
| 34 |
- EXTRAS="$EXTRAS check_ldap" |
| 35 |
- AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s) |
| 36 |
-else |
| 37 |
- AC_MSG_WARN([Skipping LDAP plugin]) |
| 38 |
- AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).]) |
| 39 |
-fi |
| 40 |
-LIBS="$_SAVEDLIBS" |
| 41 |
- |
| 42 |
dnl Check for headers used by check_ide_smart |
| 43 |
AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no) |
| 44 |
if test "$FOUNDINCLUDE" = "yes" ; then |
| 45 |
@@ -305,6 +288,8 @@ fi |
| 46 |
AC_ARG_WITH([ipv6], |
| 47 |
[AS_HELP_STRING([--with-ipv6], [support IPv6 @<:@default=check@:>@])], |
| 48 |
[], [with_ipv6=check]) |
| 49 |
+AC_ARG_WITH([ldap],[AS_HELP_STRING([--with-ldap], [support Openldap @<:@default=check@:>@])], |
| 50 |
+ [], [with_ldap=check]) |
| 51 |
|
| 52 |
dnl Check for AF_INET6 support - unistd.h required for Darwin |
| 53 |
if test "$with_ipv6" != "no"; then |
| 54 |
@@ -333,6 +318,24 @@ if test "$with_ipv6" != "no"; then |
| 55 |
with_ipv6="$np_cv_sys_ipv6" |
| 56 |
fi |
| 57 |
|
| 58 |
+dnl Check for LDAP libraries |
| 59 |
+if test "$with_ldap" != "no"; then |
| 60 |
+ |
| 61 |
+ _SAVEDLIBS="$LIBS" |
| 62 |
+ AC_CHECK_LIB(ldap,main,[:],,-llber) |
| 63 |
+ if test "$ac_cv_lib_ldap_main" = "yes"; then |
| 64 |
+ LDAPLIBS="-lldap -llber"\ |
| 65 |
+ LDAPINCLUDE="-I/usr/include/ldap" |
| 66 |
+ AC_SUBST(LDAPLIBS) |
| 67 |
+ AC_SUBST(LDAPINCLUDE) |
| 68 |
+ AC_CHECK_FUNCS(ldap_set_option) |
| 69 |
+ EXTRAS="$EXTRAS check_ldap" |
| 70 |
+ AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s) |
| 71 |
+ else |
| 72 |
+ AC_MSG_ERROR([Cannot find openldap libraries.]) |
| 73 |
+ fi |
| 74 |
+fi |
| 75 |
+LIBS="$_SAVEDLIBS" |
| 76 |
|
| 77 |
dnl Checks for Kerberos. Must come before openssl checks for Redhat EL 3 |
| 78 |
AC_CHECK_HEADERS(krb5.h,FOUNDINCLUDE=yes,FOUNDINCLUDE=no) |
Archives