heimdal-ldap.patch

   1 --- heimdal-0.8.1/lib/hdb/Makefile.am.orig      2007-04-23 18:23:48.000000000 +0200
   2 +++ heimdal-0.8.1/lib/hdb/Makefile.am   2007-07-05 20:57:31.063110405 +0200
   3 @@ -39,11 +39,13 @@
   4
   5  ldap_so = hdb_ldap.la
   6  hdb_ldap_la_SOURCES = hdb-ldap.c
   7 -hdb_ldap_la_LDFLAGS = -module
   8 +hdb_ldap_la_LDFLAGS = -module -avoid-version
   9 +hdb_ldap_la_LIBADD = $(LIB_openldap) libhdb.la
  10
  11  else
  12
  13  ldap = hdb-ldap.c
  14 +ldap_lib = $(LIB_openldap)
  15
  16  endif
  17
  18 @@ -78,7 +80,7 @@
  19         ../krb5/libkrb5.la \
  20         ../asn1/libasn1.la \
  21         $(LIBADD_roken) \
  22 -       $(LIB_openldap) \
  23 +       $(ldap_lib) \
  24         $(LIB_dlopen) \
  25         $(DBLIB) \
  26         $(LIB_NDBM)
  27 --- heimdal-0.8.1/kadmin/Makefile.am.orig       2007-04-23 18:24:45.000000000 +0200
  28 +++ heimdal-0.8.1/kadmin/Makefile.am    2007-07-05 23:44:05.368653419 +0200
  29 @@ -62,7 +62,6 @@
  30
  31  LDADD_common = \
  32         $(top_builddir)/lib/hdb/libhdb.la \
  33 -       $(LIB_openldap) \
  34         $(top_builddir)/lib/krb5/libkrb5.la \
  35         $(LIB_des) \
  36         $(top_builddir)/lib/asn1/libasn1.la \
  37 --- heimdal-0.8.1/kcm/Makefile.am.orig  2007-04-23 18:24:31.000000000 +0200
  38 +++ heimdal-0.8.1/kcm/Makefile.am       2007-07-05 23:43:51.151843250 +0200
  39 @@ -32,7 +32,6 @@
  40  man_MANS = kcm.8
  41
  42  LDADD = $(top_builddir)/lib/hdb/libhdb.la \
  43 -       $(LIB_openldap) \
  44         $(top_builddir)/lib/krb5/libkrb5.la \
  45         $(LIB_krb4) \
  46         $(LIB_des) \
  47 --- heimdal-0.8.1/kdc/Makefile.am.orig  2007-04-23 18:24:42.000000000 +0200
  48 +++ heimdal-0.8.1/kdc/Makefile.am       2007-07-05 23:43:29.950635061 +0200
  49 @@ -60,7 +60,6 @@
  50
  51  hprop_LDADD = \
  52         $(top_builddir)/lib/hdb/libhdb.la \
  53 -       $(LIB_openldap) \
  54         $(top_builddir)/lib/krb5/libkrb5.la \
  55         $(LIB_kdb) $(LIB_krb4) \
  56         $(LIB_des) \
  57 @@ -70,7 +69,6 @@
  58
  59  hpropd_LDADD = \
  60         $(top_builddir)/lib/hdb/libhdb.la \
  61 -       $(LIB_openldap) \
  62         $(top_builddir)/lib/krb5/libkrb5.la \
  63         $(LIB_kdb) $(LIB_krb4) \
  64         $(LIB_des) \
  65 @@ -85,7 +83,6 @@
  66  libkdc_la_LIBADD = \
  67         $(LIB_pkinit) \
  68         $(top_builddir)/lib/hdb/libhdb.la \
  69 -       $(LIB_openldap) \
  70         $(top_builddir)/lib/krb5/libkrb5.la \
  71         $(LIB_kdb) $(LIB_krb4) \
  72         $(top_builddir)/lib/ntlm/libheimntlm.la \
  73 @@ -95,7 +92,6 @@
  74         $(DBLIB)
  75
  76  LDADD = $(top_builddir)/lib/hdb/libhdb.la \
  77 -       $(LIB_openldap) \
  78         $(top_builddir)/lib/krb5/libkrb5.la \
  79         $(LIB_krb4) \
  80         $(LIB_des) \
  81 --- heimdal-0.8.1/kpasswd/Makefile.am.orig      2007-04-23 18:24:46.000000000 +0200
  82 +++ heimdal-0.8.1/kpasswd/Makefile.am   2007-07-05 23:43:11.721596248 +0200
  83 @@ -19,7 +19,6 @@
  84  kpasswdd_LDADD = \
  85         $(top_builddir)/lib/kadm5/libkadm5srv.la \
  86         $(top_builddir)/lib/hdb/libhdb.la \
  87 -       $(LIB_openldap) \
  88         $(LDADD) \
  89         $(LIB_pidfile) \
  90         $(LIB_dlopen) \
  91 --- heimdal-0.8.1/lib/kadm5/Makefile.am.orig    2007-04-23 18:23:50.000000000 +0200
  92 +++ heimdal-0.8.1/lib/kadm5/Makefile.am 2007-07-05 23:40:54.657785427 +0200
  93 @@ -117,7 +117,6 @@
  94  LDADD = \
  95         libkadm5srv.la \
  96         $(top_builddir)/lib/hdb/libhdb.la \
  97 -       $(LIB_openldap) \
  98         $(top_builddir)/lib/krb5/libkrb5.la \
  99         $(top_builddir)/lib/asn1/libasn1.la \
 100         $(LIB_des) \
 101 @@ -129,7 +128,6 @@
 102  iprop_log_LDADD = \
 103         libkadm5srv.la \
 104         $(top_builddir)/lib/hdb/libhdb.la \
 105 -       $(LIB_openldap) \
 106         $(top_builddir)/lib/krb5/libkrb5.la \
 107         $(top_builddir)/lib/asn1/libasn1.la \
 108         $(LIB_des) \