| 1 |
eva 08/01/01 21:45:47 |
| 2 |
|
| 3 |
Added: gconf-2.20.1-automagic-ldap.patch |
| 4 |
digest-gconf-2.20.1-r1 |
| 5 |
Removed: digest-gconf-2.20.0 digest-gconf-2.16.0 |
| 6 |
Log: |
| 7 |
prune old releases |
| 8 |
add a patch to remove automagic dependency on ldap |
| 9 |
(Portage version: 2.1.4_rc11) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 gnome-base/gconf/files/gconf-2.20.1-automagic-ldap.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/files/gconf-2.20.1-automagic-ldap.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/files/gconf-2.20.1-automagic-ldap.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: gconf-2.20.1-automagic-ldap.patch |
| 18 |
=================================================================== |
| 19 |
Index: configure.in |
| 20 |
=================================================================== |
| 21 |
--- configure.in (révision 2495) |
| 22 |
+++ configure.in (copie de travail) |
| 23 |
@@ -177,36 +182,55 @@ |
| 24 |
|
| 25 |
AC_CHECK_FUNCS(getuid sigaction fsync fchmod fdwalk) |
| 26 |
|
| 27 |
+dnl ************************************************** |
| 28 |
+dnl LDAP support. |
| 29 |
+dnl ************************************************** |
| 30 |
|
| 31 |
LDAP_LIBS= |
| 32 |
-AC_CHECK_HEADER(ldap.h, [ |
| 33 |
- AC_CHECK_LIB(ldap, ldap_init, AC_CHECK_LIB(lber, ber_free, [LDAP_LIBS="-lldap -llber"])) |
| 34 |
+ |
| 35 |
+AC_ARG_WITH(openldap, |
| 36 |
+ AC_HELP_STRING([--with-openldap], |
| 37 |
+ [Enable LDAP backend @<:@default=auto@:>@]), |
| 38 |
+ ,with_openldap=auto) |
| 39 |
+ |
| 40 |
+if test x"$with_openldap" != xno; then |
| 41 |
+ AC_CHECK_HEADER(ldap.h, [ |
| 42 |
+ AC_CHECK_LIB(ldap, ldap_init, AC_CHECK_LIB(lber, ber_free, [LDAP_LIBS="-lldap -llber"])) |
| 43 |
]) |
| 44 |
-AC_SUBST(LDAP_LIBS) |
| 45 |
-AM_CONDITIONAL(LDAP_SUPPORT, test -n "$LDAP_LIBS") |
| 46 |
+ AC_SUBST(LDAP_LIBS) |
| 47 |
|
| 48 |
-dnl ************************************************** |
| 49 |
-dnl LDAP support. |
| 50 |
-dnl ************************************************** |
| 51 |
-if test "$os_win32" != yes; then |
| 52 |
+ if test "$os_win32" != yes; then |
| 53 |
+ SAVE_CFLAGS="$CFLAGS" |
| 54 |
+ SAVE_LIBS="$LIBS" |
| 55 |
+ LDAP_CFLAGS="-DLDAP_DEPRECATED" |
| 56 |
+ CFLAGS="$CFLAGS $LDAP_CFLAGS" |
| 57 |
+ LIBS="$LIBS $LDAP_LIBS" |
| 58 |
+ AC_CHECK_FUNCS(ldap_ntlm_bind) |
| 59 |
+ CFLAGS="$SAVE_CFLAGS" |
| 60 |
+ LIBS="$SAVE_LIBS" |
| 61 |
+ |
| 62 |
+ else # Win32 |
| 63 |
+ LDAP_CFLAGS="-DLDAP_DEPRECATED" |
| 64 |
+ LDAP_LIBS="-lwldap32" |
| 65 |
+ AC_SUBST(LDAP_CFLAGS) |
| 66 |
+ AC_SUBST(LDAP_LIBS) |
| 67 |
+ AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) |
| 68 |
+ msg_ldap="yes" |
| 69 |
+ fi # Win32 |
| 70 |
+ |
| 71 |
+ if test -z "$LDAP_LIBS"; then |
| 72 |
+ if test x"$with_openldap" = xyes; then |
| 73 |
+ AC_MSG_ERROR([*** LDAP support explicitely requested but not found ***]) |
| 74 |
+ else |
| 75 |
+ AC_MSG_WARN([*** LDAP support not found ***]) |
| 76 |
+ fi |
| 77 |
+ fi |
| 78 |
+ |
| 79 |
+else |
| 80 |
+ AC_DEFINE(HAVE_LDAP,0,[Define if you have LDAP support]) |
| 81 |
+fi |
| 82 |
|
| 83 |
-SAVE_CFLAGS="$CFLAGS" |
| 84 |
-SAVE_LIBS="$LIBS" |
| 85 |
-LDAP_CFLAGS="-DLDAP_DEPRECATED" |
| 86 |
-CFLAGS="$CFLAGS $LDAP_CFLAGS" |
| 87 |
-LIBS="$LIBS $LDAP_LIBS" |
| 88 |
-AC_CHECK_FUNCS(ldap_ntlm_bind) |
| 89 |
-CFLAGS="$SAVE_CFLAGS" |
| 90 |
-LIBS="$SAVE_LIBS" |
| 91 |
- |
| 92 |
-else # Win32 |
| 93 |
-LDAP_CFLAGS="-DLDAP_DEPRECATED" |
| 94 |
-LDAP_LIBS="-lwldap32" |
| 95 |
-AC_SUBST(LDAP_CFLAGS) |
| 96 |
-AC_SUBST(LDAP_LIBS) |
| 97 |
-AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support]) |
| 98 |
-msg_ldap="yes" |
| 99 |
-fi # Win32 |
| 100 |
+AM_CONDITIONAL(LDAP_SUPPORT, test -n "$LDAP_LIBS") |
| 101 |
|
| 102 |
IT_PROG_INTLTOOL([0.35.0]) |
| 103 |
|
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
1.1 gnome-base/gconf/files/digest-gconf-2.20.1-r1 |
| 108 |
|
| 109 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/files/digest-gconf-2.20.1-r1?rev=1.1&view=markup |
| 110 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/files/digest-gconf-2.20.1-r1?rev=1.1&content-type=text/plain |
| 111 |
|
| 112 |
Index: digest-gconf-2.20.1-r1 |
| 113 |
=================================================================== |
| 114 |
MD5 646fc896c6282a8f103365af0fa2e303 GConf-2.20.1.tar.bz2 1404919 |
| 115 |
RMD160 743bee341731402e5d4938ee030adf4f463d9a52 GConf-2.20.1.tar.bz2 1404919 |
| 116 |
SHA256 0fb446b87e71fe1089f43e671b5b7689ec91d781b5b2e8f0fc72d4a83a014838 GConf-2.20.1.tar.bz2 1404919 |
| 117 |
|
| 118 |
|
| 119 |
|
| 120 |
-- |
| 121 |
gentoo-commits@g.o mailing list |
Archives