libs/openldap/patches/001-automake-compat.patch

   1 --- /dev/null
   2 +++ b/Makefile.am
   3 @@ -0,0 +1 @@
   4 +SUBDIRS = include libraries clients servers tests doc
   5 --- a/libraries/Makefile.in
   6 +++ b/libraries/Makefile.in
   7 @@ -13,6 +13,8 @@
   8  ## top-level directory of the distribution or, alternatively, at
   9  ## <http://www.OpenLDAP.org/license.html>.
  10
  11 +SHELL = @SHELL@
  12 +
  13  SUBDIRS= \
  14         liblutil \
  15         liblber \
  16 --- a/libraries/liblber/Makefile.in
  17 +++ b/libraries/liblber/Makefile.in
  18 @@ -13,6 +13,8 @@
  19  ## top-level directory of the distribution or, alternatively, at
  20  ## <http://www.OpenLDAP.org/license.html>.
  21
  22 +SHELL = @SHELL@
  23 +
  24  LIBRARY = liblber.la
  25
  26  NT_SRCS = nt_err.c
  27 --- a/libraries/libldap/Makefile.in
  28 +++ b/libraries/libldap/Makefile.in
  29 @@ -13,6 +13,8 @@
  30  ## top-level directory of the distribution or, alternatively, at
  31  ## <http://www.OpenLDAP.org/license.html>.
  32
  33 +SHELL = @SHELL@
  34 +
  35  LIBRARY = libldap.la
  36
  37  PROGRAMS = apitest dntest ftest ltest urltest
  38 --- a/libraries/libldap_r/Makefile.in
  39 +++ b/libraries/libldap_r/Makefile.in
  40 @@ -13,6 +13,8 @@
  41  ## top-level directory of the distribution or, alternatively, at
  42  ## <http://www.OpenLDAP.org/license.html>.
  43
  44 +SHELL = @SHELL@
  45 +
  46  LIBRARY = libldap_r.la
  47
  48  PROGRAMS = apitest ltest
  49 --- a/libraries/liblunicode/Makefile.in
  50 +++ b/libraries/liblunicode/Makefile.in
  51 @@ -13,6 +13,8 @@
  52  ## top-level directory of the distribution or, alternatively, at
  53  ## <http://www.OpenLDAP.org/license.html>.
  54
  55 +SHELL = @SHELL@
  56 +
  57  LIBRARY = liblunicode.a
  58
  59  XXDIR = $(srcdir)/ucdata/
  60 --- a/libraries/liblutil/Makefile.in
  61 +++ b/libraries/liblutil/Makefile.in
  62 @@ -13,6 +13,8 @@
  63  ## top-level directory of the distribution or, alternatively, at
  64  ## <http://www.OpenLDAP.org/license.html>.
  65
  66 +SHELL = @SHELL@
  67 +
  68  LIBRARY        = liblutil.a
  69  PROGRAM = testavl
  70
  71 --- a/libraries/librewrite/Makefile.in
  72 +++ b/libraries/librewrite/Makefile.in
  73 @@ -16,6 +16,8 @@
  74  ## Copyright 2000-2001 Pierangelo Masarati <ando@sys-net.it>
  75  ##
  76
  77 +SHELL = @SHELL@
  78 +
  79  SRCS = config.c context.c info.c ldapmap.c map.c params.c rule.c \
  80         session.c subst.c var.c xmap.c \
  81         parse.c rewrite.c
  82 --- a/clients/tools/Makefile.in
  83 +++ b/clients/tools/Makefile.in
  84 @@ -13,6 +13,8 @@
  85  ## top-level directory of the distribution or, alternatively, at
  86  ## <http://www.OpenLDAP.org/license.html>.
  87
  88 +SHELL = @SHELL@
  89 +
  90  SRCS   = ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c \
  91                 ldappasswd.c ldapwhoami.c ldapcompare.c \
  92                 ldapexop.c ldapurl.c common.c
  93 --- a/servers/slapd/Makefile.in
  94 +++ b/servers/slapd/Makefile.in
  95 @@ -13,6 +13,8 @@
  96  ## top-level directory of the distribution or, alternatively, at
  97  ## <http://www.OpenLDAP.org/license.html>.
  98
  99 +SHELL = @SHELL@
 100 +
 101  SLAPTOOLS=slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema
 102  PROGRAMS=slapd $(SLAPTOOLS)
 103  XPROGRAMS=sslapd libbackends.a .backend liboverlays.a
 104 --- a/servers/slapd/overlays/Makefile.in
 105 +++ b/servers/slapd/overlays/Makefile.in
 106 @@ -13,6 +13,8 @@
 107  ## top-level directory of the distribution or, alternatively, at
 108  ## <http://www.OpenLDAP.org/license.html>.
 109
 110 +SHELL = @SHELL@
 111 +
 112  SRCS = overlays.c \
 113         accesslog.c \
 114         auditlog.c \
 115 --- a/tests/progs/Makefile.in
 116 +++ b/tests/progs/Makefile.in
 117 @@ -13,6 +13,8 @@
 118  ## top-level directory of the distribution or, alternatively, at
 119  ## <http://www.OpenLDAP.org/license.html>.
 120
 121 +SHELL = @SHELL@
 122 +
 123  PROGRAMS = slapd-tester slapd-search slapd-read slapd-addel slapd-modrdn \
 124                 slapd-modify slapd-bind ldif-filter
 125
 126 --- a/servers/slapd/back-bdb/Makefile.in
 127 +++ b/servers/slapd/back-bdb/Makefile.in
 128 @@ -13,6 +13,8 @@
 129  ## top-level directory of the distribution or, alternatively, at
 130  ## <http://www.OpenLDAP.org/license.html>.
 131
 132 +SHELL = @SHELL@
 133 +
 134  SRCS = init.c tools.c config.c \
 135         add.c bind.c compare.c delete.c modify.c modrdn.c search.c \
 136         extended.c referral.c operational.c \
 137 --- a/servers/slapd/back-dnssrv/Makefile.in
 138 +++ b/servers/slapd/back-dnssrv/Makefile.in
 139 @@ -18,6 +18,8 @@
 140  #  The DNSSRV backend was written by Kurt D. Zeilenga.
 141  #
 142
 143 +SHELL = @SHELL@
 144 +
 145  SRCS   = init.c bind.c search.c config.c referral.c
 146  OBJS   = init.lo bind.lo search.lo config.lo referral.lo
 147
 148 --- a/servers/slapd/back-hdb/Makefile.in
 149 +++ b/servers/slapd/back-hdb/Makefile.in
 150 @@ -15,6 +15,8 @@
 151  #
 152  ## Copyright 2003 Howard Chu @ Symas Corp. See master COPYRIGHT file for terms.
 153
 154 +SHELL = @SHELL@
 155 +
 156  XXDIR = $(srcdir)/../back-bdb
 157
 158  XXSRCS = init.c tools.c config.c \
 159 --- a/servers/slapd/back-ldap/Makefile.in
 160 +++ b/servers/slapd/back-ldap/Makefile.in
 161 @@ -13,6 +13,8 @@
 162  ## top-level directory of the distribution or, alternatively, at
 163  ## <http://www.OpenLDAP.org/license.html>.
 164
 165 +SHELL = @SHELL@
 166 +
 167  SRCS   = init.c config.c search.c bind.c unbind.c add.c compare.c \
 168                 delete.c modify.c modrdn.c extended.c chain.c \
 169                 distproc.c monitor.c pbind.c
 170 --- a/servers/slapd/back-ldif/Makefile.in
 171 +++ b/servers/slapd/back-ldif/Makefile.in
 172 @@ -13,6 +13,8 @@
 173  ## top-level directory of the distribution or, alternatively, at
 174  ## <http://www.OpenLDAP.org/license.html>.
 175
 176 +SHELL = @SHELL@
 177 +
 178  SRCS = ldif.c
 179  OBJS = ldif.lo
 180
 181 --- a/servers/slapd/back-meta/Makefile.in
 182 +++ b/servers/slapd/back-meta/Makefile.in
 183 @@ -13,6 +13,8 @@
 184  ## top-level directory of the distribution or, alternatively, at
 185  ## <http://www.OpenLDAP.org/license.html>.
 186
 187 +SHELL = @SHELL@
 188 +
 189  SRCS   = init.c config.c search.c bind.c unbind.c add.c compare.c \
 190                 delete.c modify.c modrdn.c suffixmassage.c map.c \
 191                 conn.c candidates.c dncache.c
 192 --- a/servers/slapd/back-monitor/Makefile.in
 193 +++ b/servers/slapd/back-monitor/Makefile.in
 194 @@ -13,6 +13,8 @@
 195  ## top-level directory of the distribution or, alternatively, at
 196  ## <http://www.OpenLDAP.org/license.html>.
 197
 198 +SHELL = @SHELL@
 199 +
 200  SRCS = init.c search.c compare.c modify.c bind.c \
 201         operational.c \
 202         cache.c entry.c \
 203 --- a/servers/slapd/back-ndb/Makefile.in
 204 +++ b/servers/slapd/back-ndb/Makefile.in
 205 @@ -17,6 +17,8 @@
 206  ## This work was initially developed by Howard Chu for inclusion
 207  ## in OpenLDAP Software. This work was sponsored by MySQL.
 208
 209 +SHELL = @SHELL@
 210 +
 211  SRCS = init.cpp tools.cpp config.cpp ndbio.cpp \
 212         add.cpp bind.cpp compare.cpp delete.cpp modify.cpp modrdn.cpp search.cpp
 213
 214 --- a/servers/slapd/back-null/Makefile.in
 215 +++ b/servers/slapd/back-null/Makefile.in
 216 @@ -13,6 +13,8 @@
 217  ## top-level directory of the distribution or, alternatively, at
 218  ## <http://www.OpenLDAP.org/license.html>.
 219
 220 +SHELL = @SHELL@
 221 +
 222  SRCS = null.c
 223  OBJS = null.lo
 224
 225 --- a/servers/slapd/back-passwd/Makefile.in
 226 +++ b/servers/slapd/back-passwd/Makefile.in
 227 @@ -13,6 +13,8 @@
 228  ## top-level directory of the distribution or, alternatively, at
 229  ## <http://www.OpenLDAP.org/license.html>.
 230
 231 +SHELL = @SHELL@
 232 +
 233  SRCS   = search.c config.c init.c
 234  OBJS   = search.lo config.lo init.lo
 235
 236 --- a/servers/slapd/back-perl/Makefile.in
 237 +++ b/servers/slapd/back-perl/Makefile.in
 238 @@ -14,6 +14,8 @@
 239  ## top-level directory of the distribution or, alternatively, at
 240  ## <http://www.OpenLDAP.org/license.html>.
 241
 242 +SHELL = @SHELL@
 243 +
 244  SRCS   = init.c search.c close.c config.c bind.c compare.c \
 245                 modify.c add.c modrdn.c delete.c
 246  OBJS   = init.lo search.lo close.lo config.lo bind.lo compare.lo \
 247 --- a/servers/slapd/back-relay/Makefile.in
 248 +++ b/servers/slapd/back-relay/Makefile.in
 249 @@ -13,6 +13,8 @@
 250  ## top-level directory of the distribution or, alternatively, at
 251  ## <http://www.OpenLDAP.org/license.html>.
 252
 253 +SHELL = @SHELL@
 254 +
 255  SRCS   = init.c op.c
 256  OBJS   = init.lo op.lo
 257
 258 --- a/servers/slapd/back-shell/Makefile.in
 259 +++ b/servers/slapd/back-shell/Makefile.in
 260 @@ -13,6 +13,8 @@
 261  ## top-level directory of the distribution or, alternatively, at
 262  ## <http://www.OpenLDAP.org/license.html>.
 263
 264 +SHELL = @SHELL@
 265 +
 266  SRCS   = init.c config.c fork.c search.c bind.c unbind.c add.c \
 267                 delete.c modify.c modrdn.c compare.c result.c
 268  OBJS   = init.lo config.lo fork.lo search.lo bind.lo unbind.lo add.lo \
 269 --- a/servers/slapd/back-sock/Makefile.in
 270 +++ b/servers/slapd/back-sock/Makefile.in
 271 @@ -17,6 +17,8 @@
 272  ## This work was initially developed by Brian Candler for inclusion
 273  ## in OpenLDAP Software.
 274
 275 +SHELL = @SHELL@
 276 +
 277  SRCS   = init.c config.c opensock.c search.c bind.c unbind.c add.c \
 278                 delete.c modify.c modrdn.c compare.c result.c
 279  OBJS   = init.lo config.lo opensock.lo search.lo bind.lo unbind.lo add.lo \
 280 --- a/servers/slapd/back-sql/Makefile.in
 281 +++ b/servers/slapd/back-sql/Makefile.in
 282 @@ -13,6 +13,8 @@
 283  ## top-level directory of the distribution or, alternatively, at
 284  ## <http://www.OpenLDAP.org/license.html>.
 285
 286 +SHELL = @SHELL@
 287 +
 288  SRCS   = init.c config.c search.c bind.c compare.c operational.c \
 289                 entry-id.c schema-map.c sql-wrap.c modify.c util.c \
 290                 add.c delete.c modrdn.c api.c
 291 --- a/servers/slapd/shell-backends/Makefile.in
 292 +++ b/servers/slapd/shell-backends/Makefile.in
 293 @@ -13,6 +13,8 @@
 294  ## top-level directory of the distribution or, alternatively, at
 295  ## <http://www.OpenLDAP.org/license.html>.
 296
 297 +SHELL = @SHELL@
 298 +
 299  PROGRAMS = passwd-shell
 300
 301  SRCS = passwd-shell.c shellutil.c
 302 --- a/servers/slapd/slapi/Makefile.in
 303 +++ b/servers/slapd/slapi/Makefile.in
 304 @@ -14,6 +14,8 @@
 305  ## top-level directory of the distribution or, alternatively, at
 306  ## <http://www.OpenLDAP.org/license.html>.
 307
 308 +SHELL = @SHELL@
 309 +
 310  LIBRARY = libslapi.la
 311
 312  #all-common: $(LIBRARY) $(PROGRAMS)