~ubuntu-branches/ubuntu/maverick/openldap/maverick-proposed

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug, Steve Langasek, Mathias Gug
  • Date: 2009-02-18 18:44:00 UTC
  • mfrom: (1.1.2 upstream) (0.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20090218184400-zw4mjse9eywt5566
Tags: 2.4.14-0ubuntu1
[ Steve Langasek ]
* New upstream version
  - Fixes a bug with the pcache overlay not returning cached entries
    (closes: #497697)
  - Update evolution-ntlm patch to apply to current Makefiles.
  - (tentatively) drop gnutls-ciphers, since this bug was reported to be
    fixed upstream in 2.4.8.  The fix applied in 2.4.8 didn't match the
    patch from the bug report, so this should be watched for regressions.
* Build against db4.7 instead of db4.2 at last!  Closes: #421946.
* Build with --disable-ndb, to avoid a misbuild when libmysqlclient is
  installed in the build environment.
* New patch, no-crlcheck-for-gnutls, to fix a build failure when using
  --with-tls=gnutls.

[ Mathias Gug ]
* Merge from debian unstable, remaining changes:
  - debian/apparmor-profile: add AppArmor profile
  - debian/slapd.postinst: Reload AA profile on configuration
  - updated debian/slapd.README.Debian for note on AppArmor
  - debian/control: Recommends apparmor >= 2.1+1075-0ubuntu6
  - debian/control: Conflicts with apparmor-profiles << 2.1+1075-0ubuntu4
    to make sure that if earlier version of apparmour-profiles gets
    installed it won't overwrite our profile.
  - Modify Maintainer value to match the DebianMaintainerField
    speficication.
  - follow ApparmorProfileMigration and force apparmor compalin mode on 
    some upgrades (LP: #203529)
  - debian/slapd.dirs: add etc/apparmor.d/force-complain
  - debian/slapd.preinst: create symlink for force-complain on pre-feisty
    upgrades, upgrades where apparmor-profiles profile is unchanged (ie
    non-enforcing) and upgrades where apparmor profile does not exist.
  - debian/slapd.postrm: remove symlink in force-complain/ on purge
  - debian/patches/fix-ucred-libc due to changes how newer glibc handle
    the ucred struct now.
  - debian/control:
    - Build-depend on libltdl7-dev rather then libltdl3-dev.
  - debian/patches/autogen.sh:
    - Call libtoolize with the --install option to install config.{guess,sub}
      files.
  - Don't use local statement in config script as it fails if /bin/sh
    points to bash (LP: #286063).
  - Disable the testsuite on hppa. Allows building of packages on this
    architecture again, once this package is in the archive.
    LP: #288908.
  - debian/slapd.postinst, debian/slapd.script-common: set correct ownership
    and permissions on /var/lib/ldap, /etc/ldap/slapd.d (group readable) and
    /var/run/slapd (world readable). (LP: #257667).
  - debian/patches/nssov-build, debian/rules: 
    Build and package the nss overlay.
    debian/schema/misc.ldif: add ldif file for the misc schema, which defines
    rfc822MailMember (required by the nss overlay).
  - debian/{control,rules}: enable PIE hardening
  - Use cn=config as the default configuration backend instead of 
    slapd.conf. Migrate slapd.conf  file to /etc/ldap/slapd.d/ on upgrade
    asking the end user to enter a new password to control the access to the
    cn=config tree.
* debian/patches/corrupt-contextCSN: The contextCSN can get corrupted at
  times. (ITS: #5947)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
dnl $OpenLDAP: pkg/ldap/configure.in,v 1.631.2.9 2008/02/11 23:26:37 kurt Exp $
 
1
dnl $OpenLDAP: pkg/ldap/configure.in,v 1.631.2.22 2009/01/26 21:54:23 quanah Exp $
2
2
dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
3
3
dnl
4
 
dnl Copyright 1998-2008 The OpenLDAP Foundation.
 
4
dnl Copyright 1998-2009 The OpenLDAP Foundation.
5
5
dnl All rights reserved.
6
6
dnl
7
7
dnl Redistribution and use in source and binary forms, with or without
23
23
define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl
24
24
dnl ================================================================
25
25
dnl Configure.in for OpenLDAP
26
 
AC_COPYRIGHT([[Copyright 1998-2008 The OpenLDAP Foundation. All rights reserved.
 
26
AC_COPYRIGHT([[Copyright 1998-2009 The OpenLDAP Foundation. All rights reserved.
27
27
Restrictions apply, see COPYRIGHT and LICENSE files.]])
28
 
AC_REVISION([$OpenLDAP: pkg/ldap/configure.in,v 1.631.2.9 2008/02/11 23:26:37 kurt Exp $])
 
28
AC_REVISION([$OpenLDAP: pkg/ldap/configure.in,v 1.631.2.22 2009/01/26 21:54:23 quanah Exp $])
29
29
AC_INIT([OpenLDAP],,[http://www.openldap.org/its/])
30
30
m4_define([AC_PACKAGE_BUGREPORT],[<http://www.openldap.org/its/>])
31
31
AC_CONFIG_SRCDIR(build/version.sh)dnl
96
96
/* begin of portable.h.pre */
97
97
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
98
98
 *
99
 
 * Copyright 1998-2008 The OpenLDAP Foundation
 
99
 * Copyright 1998-2009 The OpenLDAP Foundation
100
100
 * All rights reserved.
101
101
 *
102
102
 * Redistribution and use in source and binary forms, with or without
242
242
        auto, [auto yes no] )
243
243
OL_ARG_WITH(fetch,[  --with-fetch                 with fetch(3) URL support],
244
244
        auto, [auto yes no] )
 
245
OL_ARG_WITH(gssapi,[  --with-gssapi               with GSSAPI support],
 
246
        auto, [auto yes no] )
245
247
OL_ARG_WITH(threads,[  --with-threads     with threads],
246
248
        auto, [auto nt posix mach pth lwp yes no manual] )
247
249
OL_ARG_WITH(tls,[  --with-tls             with TLS/SSL support auto|openssl|gnutls],
253
255
        [  --with-mp               with multiple precision statistics auto|longlong|long|bignum|gmp],
254
256
        auto, [auto longlong long bignum gmp yes no])
255
257
OL_ARG_WITH(odbc,
256
 
        [  --with-odbc             with specific ODBC support iodbc|unixodbc|auto],
257
 
        auto, [auto iodbc unixodbc] )
 
258
        [  --with-odbc             with specific ODBC support iodbc|unixodbc|odbc32|auto],
 
259
        auto, [auto iodbc unixodbc odbc32] )
258
260
 
259
261
dnl ----------------------------------------------------------------
260
262
dnl Server options
286
288
        ldap \
287
289
        meta \
288
290
        monitor \
 
291
        ndb \
289
292
        null \
290
293
        passwd \
291
294
        perl \
311
314
        no, [no yes mod], ol_enable_backends)dnl
312
315
OL_ARG_ENABLE(monitor,[    --enable-monitor       enable monitor backend],
313
316
        yes, [no yes mod], ol_enable_backends)dnl
 
317
OL_ARG_ENABLE(ndb,[    --enable-ndb       enable MySQL NDB Cluster backend],
 
318
        no, [no yes mod], ol_enable_backends)dnl
314
319
OL_ARG_ENABLE(null,[    --enable-null     enable null backend],
315
320
        no, [no yes mod], ol_enable_backends)dnl
316
321
OL_ARG_ENABLE(passwd,[    --enable-passwd         enable passwd backend],
330
335
dnl SLAPD Overlay Options
331
336
Overlays="accesslog \
332
337
        auditlog \
 
338
        collect \
333
339
        constraint \
334
340
        dds \
 
341
        deref \
335
342
        dyngroup \
336
343
        dynlist \
337
344
        memberof \
355
362
        no, [no yes mod], ol_enable_overlays)
356
363
OL_ARG_ENABLE(auditlog,[    --enable-auditlog     Audit Logging overlay],
357
364
        no, [no yes mod], ol_enable_overlays)
 
365
OL_ARG_ENABLE(collect,[    --enable-collect       Collect overlay],
 
366
        no, [no yes mod], ol_enable_overlays)
358
367
OL_ARG_ENABLE(constraint,[    --enable-constraint         Attribute Constraint overlay],
359
368
        no, [no yes mod], ol_enable_overlays)
360
369
OL_ARG_ENABLE(dds,[    --enable-dds       Dynamic Directory Services overlay],
361
370
        no, [no yes mod], ol_enable_overlays)
 
371
OL_ARG_ENABLE(deref,[    --enable-deref   Dereference overlay],
 
372
        no, [no yes mod], ol_enable_overlays)
362
373
OL_ARG_ENABLE(dyngroup,[    --enable-dyngroup     Dynamic Group overlay],
363
374
        no, [no yes mod], ol_enable_overlays)
364
375
OL_ARG_ENABLE(dynlist,[    --enable-dynlist       Dynamic List overlay],
460
471
        test $ol_enable_ldap = no &&
461
472
        test $ol_enable_meta = no &&
462
473
        test $ol_enable_monitor = no &&
 
474
        test $ol_enable_ndb = no &&
463
475
        test $ol_enable_null = no &&
464
476
        test $ol_enable_passwd = no &&
465
477
        test $ol_enable_perl = no &&
500
512
dnl Initialize vars
501
513
LDAP_LIBS=
502
514
BDB_LIBS=
 
515
SLAPD_NDB_LIBS=
 
516
SLAPD_NDB_INCS=
503
517
LTHREAD_LIBS=
504
518
LUTIL_LIBS=
505
519
 
518
532
BUILD_LDAP=no
519
533
BUILD_META=no
520
534
BUILD_MONITOR=no
 
535
BUILD_NDB=no
521
536
BUILD_NULL=no
522
537
BUILD_PASSWD=no
523
538
BUILD_PERL=no
566
581
KRB4_LIBS=
567
582
KRB5_LIBS=
568
583
SASL_LIBS=
 
584
GSSAPI_LIBS=
569
585
TLS_LIBS=
570
586
MODULES_LIBS=
571
587
SLAPI_LIBS=
675
691
fi
676
692
 
677
693
AC_PROG_CPP
 
694
OL_MSVC
678
695
 
679
696
dnl ----------------------------------------------------------------
680
697
dnl Checks for Windows NT
681
698
case $host_os in
682
699
  *mingw32* ) ac_cv_mingw32=yes ;;
683
700
  *cygwin* ) ac_cv_cygwin=yes ;;
 
701
  *interix* ) ac_cv_interix=yes ;;
684
702
esac
685
703
 
686
704
dnl ----------------------------------------------------------------
826
844
)
827
845
 
828
846
dnl Only check Winsock on MinGW
829
 
if test "$ac_cv_mingw32" = yes ; then
 
847
if test "$ac_cv_mingw32" = yes \
 
848
        -o "$ac_cv_interix" = yes \
 
849
        -o "$ol_cv_msvc" = yes
 
850
then
830
851
        AC_CHECK_HEADERS( winsock.h winsock2.h )
831
852
fi
832
853
 
858
879
        AC_CHECK_LIB(V3, sigset)
859
880
fi
860
881
 
 
882
if test $ol_cv_msvc ; then
 
883
   ol_cv_winsock=yes
 
884
fi
 
885
 
861
886
dnl The following is INTENTIONALLY scripted out because shell does not
862
887
dnl support variable names with the '@' character, which is what
863
888
dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS
864
889
if test "$ac_cv_header_winsock_h" = yes; then
865
 
AC_CACHE_CHECK([for winsock], [ol_cv_winsock],
866
 
save_LIBS="$LIBS"
867
 
for curlib in ws2_32 wsock32; do
868
 
        LIBS="$LIBS -l$curlib"
869
 
        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>
 
890
        AC_CACHE_CHECK([for winsock], [ol_cv_winsock],[
 
891
        save_LIBS="$LIBS"
 
892
        for curlib in none ws2_32 wsock32; do
 
893
                if test curlib != none ; then
 
894
                LIBS="$save_LIBS -l$curlib"
 
895
                fi
 
896
                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>
870
897
                        ]], [[
871
898
                        socket(0,0,0);
872
899
                        select(0,NULL,NULL,NULL,NULL);
873
900
                        closesocket(0);
874
901
                        gethostname(NULL,0);
875
 
                        ]])],[ol_cv_winsock=yes],[ol_cv_winsock=no])
876
 
 
877
 
        if test $ol_cv_winsock = yes; then
878
 
                AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
879
 
                ac_cv_func_socket=yes
880
 
                ac_cv_func_select=yes
881
 
                ac_cv_func_closesocket=yes
882
 
                ac_cv_func_gethostname=yes
883
 
                if test $curlib = ws2_32; then
884
 
                        ol_cv_winsock=winsock2
885
 
                        AC_DEFINE(HAVE_WINSOCK2, 1,
886
 
                                  [define if you have winsock2])
 
902
                        ]])],[ol_cv_winsock=$curlib],[ol_cv_winsock=no])
 
903
 
 
904
                test "$ol_cv_winsock" != no && break
 
905
        done
 
906
        LIBS="$save_LIBS"
 
907
        ])
 
908
 
 
909
        if test $ol_cv_winsock != no ; then
 
910
        AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
 
911
        ac_cv_func_socket=yes
 
912
        ac_cv_func_select=yes
 
913
        ac_cv_func_closesocket=yes
 
914
        ac_cv_func_gethostname=yes
 
915
 
 
916
                if test $ol_cv_winsock != none -a $ol_cv_winsock != yes ; then
 
917
                LIBS="$LIBS -l$ol_cv_winsock"
887
918
                fi
888
 
                break
 
919
 
 
920
        if test $ol_cv_winsock = ws2_32 -o $ol_cv_winsock = yes ; then
 
921
                        AC_DEFINE(HAVE_WINSOCK2, 1, [define if you have winsock2])
 
922
        fi
889
923
        fi
890
 
        LIBS="$save_LIBS"
891
 
done)
892
924
fi
893
925
 
894
926
dnl Find socket()
953
985
fi
954
986
 
955
987
dnl ----------------------------------------------------------------
956
 
# strerror checks
957
988
OL_STRERROR
958
989
 
959
990
dnl ----------------------------------------------------------------
981
1012
 
982
1013
have_uuid=no
983
1014
AC_CHECK_HEADERS(sys/uuid.h)
 
1015
dnl The HAVE_UUID_TO_STR code path also needs uuid_create
984
1016
if test $ac_cv_header_sys_uuid_h = yes ; then
985
1017
        save_LIBS="$LIBS"
986
1018
        AC_SEARCH_LIBS([uuid_to_str], [uuid], [have_uuid=yes], :)
 
1019
        AC_SEARCH_LIBS([uuid_create], [uuid], :, [have_uuid=no])
987
1020
        LIBS="$save_LIBS"
988
1021
 
989
 
        if test have_uuid = yes ; then
 
1022
        if test $have_uuid = yes ; then
990
1023
                AC_DEFINE(HAVE_UUID_TO_STR,1,
991
1024
                        [define if you have uuid_to_str()])
992
1025
 
996
1029
fi
997
1030
 
998
1031
dnl Look for uuid_generate
 
1032
dnl The HAVE_UUID_GENERATE code path also needs uuid_unparse_lower
999
1033
if test $have_uuid = no ; then
1000
1034
        AC_CHECK_HEADERS(uuid/uuid.h)
1001
1035
        if test $ac_cv_header_uuid_uuid_h = yes ; then
1002
1036
                save_LIBS="$LIBS"
1003
1037
                AC_SEARCH_LIBS([uuid_generate], [uuid], [have_uuid=yes], :)
 
1038
                AC_SEARCH_LIBS([uuid_unparse_lower], [uuid], :, [have_uuid=no])
1004
1039
                LIBS="$save_LIBS"
1005
1040
 
1006
 
                if test have_uuid = yes ; then
 
1041
                if test $have_uuid = yes ; then
1007
1042
                        AC_DEFINE(HAVE_UUID_GENERATE,1,
1008
1043
                                [define if you have uuid_generate()])
1009
1044
 
1111
1146
fi
1112
1147
 
1113
1148
dnl ----------------------------------------------------------------
 
1149
dnl GSSAPI
 
1150
ol_link_gssapi=no
 
1151
 
 
1152
case $ol_with_gssapi in yes | auto)
 
1153
 
 
1154
        ol_header_gssapi=no
 
1155
        AC_CHECK_HEADERS(gssapi/gssapi.h)
 
1156
        if test $ac_cv_header_gssapi_gssapi_h = yes ; then
 
1157
                ol_header_gssapi=yes
 
1158
        else
 
1159
                AC_CHECK_HEADERS(gssapi.h)
 
1160
                if test $ac_cv_header_gssapi_h = yes ; then
 
1161
                        ol_header_gssapi=yes
 
1162
                fi
 
1163
 
 
1164
                dnl## not every gssapi has gss_oid_to_str()
 
1165
                dnl## as it's not defined in the GSSAPI V2 API
 
1166
                dnl## anymore
 
1167
                saveLIBS="$LIBS"
 
1168
                LIBS="$LIBS $GSSAPI_LIBS"
 
1169
                AC_CHECK_FUNCS(gss_oid_to_str)
 
1170
                LIBS="$saveLIBS"
 
1171
        fi
 
1172
 
 
1173
        if test $ol_header_gssapi = yes ; then
 
1174
                dnl## we check for gss_wrap
 
1175
                dnl## as it's new to the GSSAPI V2 API
 
1176
                AC_CHECK_LIB(gssapi, gss_wrap,
 
1177
                             [ol_link_gssapi=yes;GSSAPI_LIBS="-lgssapi"],
 
1178
                             [ol_link_gssapi=no])
 
1179
                if test $ol_link_gssapi != yes ; then
 
1180
                        AC_CHECK_LIB(gssapi_krb5, gss_wrap,
 
1181
                                     [ol_link_gssapi=yes;GSSAPI_LIBS="-lgssapi_krb5"],
 
1182
                                     [ol_link_gssapi=no])
 
1183
                fi
 
1184
                if test $ol_link_gssapi != yes ; then
 
1185
                        AC_CHECK_LIB(gss, gss_wrap,
 
1186
                                     [ol_link_gssapi=yes;GSSAPI_LIBS="-lgss"],
 
1187
                                     [ol_link_gssapi=no])
 
1188
                fi
 
1189
        fi
 
1190
 
 
1191
        ;;
 
1192
esac
 
1193
 
 
1194
WITH_GSSAPI=no
 
1195
if test $ol_link_gssapi = yes; then
 
1196
        AC_DEFINE(HAVE_GSSAPI, 1, [define if you have GSSAPI])
 
1197
        WITH_GSSAPI=yes
 
1198
elif test $ol_with_gssapi = auto ; then
 
1199
        AC_MSG_WARN([Could not locate GSSAPI package])
 
1200
        AC_MSG_WARN([GSSAPI authentication not supported!])
 
1201
elif test $ol_with_gssapi = yes ; then
 
1202
        AC_MSG_ERROR([GSSAPI detection failed])
 
1203
fi
 
1204
 
 
1205
dnl ----------------------------------------------------------------
1114
1206
dnl TLS/SSL
1115
1207
        
1116
1208
if test $ol_with_tls = yes ; then
1840
1932
                BDB_LIBS="$BDB_LIBS $ol_cv_lib_db"
1841
1933
        fi
1842
1934
 
1843
 
        OL_BDB_COMPAT
1844
 
 
1845
 
        if test $ol_cv_bdb_compat != yes ; then
1846
 
                AC_MSG_ERROR([BDB/HDB: BerkeleyDB version incompatible])
1847
 
        fi
1848
 
 
1849
1935
        SLAPD_LIBS="$SLAPD_LIBS \$(BDB_LIBS)"
1850
1936
 
1851
1937
        ol_link_bdb=yes 
1929
2015
        LIBS="$LTHREAD_LIBS"
1930
2016
 
1931
2017
        if test $ol_with_odbc = auto ; then
1932
 
                ol_with_odbc="iodbc unixodbc"
 
2018
                ol_with_odbc="iodbc unixodbc odbc32"
1933
2019
        fi
1934
2020
 
1935
2021
        for odbc in $ol_with_odbc ; do
1949
2035
                                fi
1950
2036
                                ;;
1951
2037
 
 
2038
                        odbc32)
 
2039
                                AC_CHECK_LIB(odbc32, SQLDriverConnect, [have_odbc32=yes], [have_odbc32=no])
 
2040
                                if test $have_odbc32 = yes ; then
 
2041
                                        ol_link_sql="-lodbc32"
 
2042
                                fi
 
2043
                                ;;
 
2044
 
1952
2045
                        *)
1953
2046
                                AC_MSG_ERROR([unknown ODBC library])
1954
2047
                                ;;
1967
2060
fi
1968
2061
 
1969
2062
dnl ----------------------------------------------------------------
 
2063
dnl MySQL NDBapi
 
2064
dnl Note: uses C++, but we don't want to add C++ test overhead to
 
2065
dnl the rest of the libtool machinery.
 
2066
ol_link_ndb=no
 
2067
if test $ol_enable_ndb != no ; then
 
2068
        AC_CHECK_PROG(MYSQL,mysql_config,yes)
 
2069
        if test "$MYSQL" != yes ; then
 
2070
                AC_MSG_ERROR([could not locate mysql_config])
 
2071
        fi
 
2072
 
 
2073
        SQL_INC=`mysql_config --include`
 
2074
        SLAPD_NDB_INCS="$SQL_INC $SQL_INC/storage/ndb $SQL_INC/storage/ndb/ndbapi"
 
2075
 
 
2076
        save_CPPFLAGS="$CPPFLAGS"
 
2077
        CPPFLAGS="$SLAPD_NDB_INCS"
 
2078
        AC_MSG_CHECKING(for NdbApi.hpp)
 
2079
        AC_PREPROC_IFELSE(
 
2080
                [AC_LANG_SOURCE([[#include <NdbApi.hpp>]])],
 
2081
                        AC_MSG_RESULT(yes),
 
2082
                        AC_MSG_ERROR([could not locate NdbApi headers])
 
2083
        )
 
2084
        CPPFLAGS="$save_CPPFLAGS"
 
2085
 
 
2086
        SQL_LIB=`mysql_config --libs_r`
 
2087
        SLAPD_NDB_LIBS="$SQL_LIB -lndbclient -lstdc++"
 
2088
 
 
2089
        save_LDFLAGS="$LDFLAGS"
 
2090
        save_LIBS="$LIBS"
 
2091
        LDFLAGS="$SQL_LIB"
 
2092
        AC_CHECK_LIB(ndbclient,ndb_init,[: ok],[
 
2093
                AC_MSG_ERROR([could not locate ndbclient library])
 
2094
        ],[-lstdc++])
 
2095
        LIBS="$save_LIBS"
 
2096
        LDFLAGS="$save_LDFLAGS"
 
2097
 
 
2098
        if test "$ol_enable_ndb" = yes ; then
 
2099
                SLAPD_LIBS="$SLAPD_LIBS \$(SLAPD_NDB_LIBS)"
 
2100
        fi
 
2101
fi
 
2102
 
 
2103
dnl ----------------------------------------------------------------
1970
2104
dnl International Components for Unicode
1971
2105
OL_ICU
1972
2106
if test "$ol_icu" = no ; then
2292
2426
        AC_DEFINE(snprintf, _snprintf, [define to snprintf routine])
2293
2427
])
2294
2428
 
2295
 
AC_CHECK_FUNC(_vsnprintf, [ac_cv_func_vsnprintf=yes
 
2429
AC_CHECK_FUNCS(vsnprintf _vsnprintf)
 
2430
 
 
2431
if test $ac_cv_func_vsnprintf = no -a $ac_cv_func__vsnprintf = yes ; then
 
2432
        ac_cv_func_vsnprintf=yes
2296
2433
        AC_DEFINE(vsnprintf, _vsnprintf, [define to vsnprintf routine])
2297
 
])
 
2434
fi
2298
2435
 
2299
2436
AC_FUNC_VPRINTF
2300
2437
 
2313
2450
        flock                   \
2314
2451
        fstat                   \
2315
2452
        getdtablesize           \
 
2453
        geteuid                 \
2316
2454
        getgrgid                \
2317
2455
        gethostname             \
2318
2456
        getpass                 \
2572
2710
        AC_DEFINE_UNQUOTED(SLAPD_META,$MFLAG,[define to support LDAP Metadirectory backend])
2573
2711
fi
2574
2712
 
 
2713
if test "$ol_enable_ndb" != no ; then
 
2714
        BUILD_SLAPD=yes
 
2715
        BUILD_NDB=$ol_enable_ndb
 
2716
        if test "$ol_enable_ndb" = mod ; then
 
2717
                SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ndb"
 
2718
                MFLAG=SLAPD_MOD_DYNAMIC
 
2719
        else
 
2720
                SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ndb"
 
2721
                MFLAG=SLAPD_MOD_STATIC
 
2722
        fi
 
2723
        AC_DEFINE_UNQUOTED(SLAPD_NDB,$MFLAG,[define to support NDB backend])
 
2724
fi
 
2725
 
2575
2726
if test "$ol_enable_null" != no ; then
2576
2727
        BUILD_SLAPD=yes
2577
2728
        BUILD_NULL=$ol_enable_null
2690
2841
        AC_DEFINE_UNQUOTED(SLAPD_OVER_AUDITLOG,$MFLAG,[define for Audit Logging overlay])
2691
2842
fi
2692
2843
 
 
2844
if test "$ol_enable_collect" != no ; then
 
2845
        BUILD_COLLECT=$ol_enable_collect
 
2846
        if test "$ol_enable_collect" = mod ; then
 
2847
                MFLAG=SLAPD_MOD_DYNAMIC
 
2848
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS collect.la"
 
2849
        else
 
2850
                MFLAG=SLAPD_MOD_STATIC
 
2851
                SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS collect.o"
 
2852
        fi
 
2853
        AC_DEFINE_UNQUOTED(SLAPD_OVER_COLLECT,$MFLAG,[define for Collect overlay])
 
2854
fi
 
2855
 
2693
2856
if test "$ol_enable_constraint" != no ; then
2694
2857
        BUILD_CONSTRAINT=$ol_enable_constraint
2695
2858
        if test "$ol_enable_constraint" = mod ; then
2714
2877
        AC_DEFINE_UNQUOTED(SLAPD_OVER_DDS,$MFLAG,[define for Dynamic Directory Services overlay])
2715
2878
fi
2716
2879
 
 
2880
if test "$ol_enable_deref" != no ; then
 
2881
        BUILD_DDS=$ol_enable_deref
 
2882
        if test "$ol_enable_deref" = mod ; then
 
2883
                MFLAG=SLAPD_MOD_DYNAMIC
 
2884
                SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS deref.la"
 
2885
        else
 
2886
                MFLAG=SLAPD_MOD_STATIC
 
2887
                SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS deref.o"
 
2888
        fi
 
2889
        AC_DEFINE_UNQUOTED(SLAPD_OVER_DEREF,$MFLAG,[define for Dynamic Directory Services overlay])
 
2890
fi
 
2891
 
2717
2892
if test "$ol_enable_dyngroup" != no ; then
2718
2893
        BUILD_DYNGROUP=$ol_enable_dyngroup
2719
2894
        if test "$ol_enable_dyngroup" = mod ; then
2889
3064
dnl They hurt more than they help.
2890
3065
dnl
2891
3066
 
2892
 
if test "$ac_cv_mingw32" = yes ; then
 
3067
if test "$ac_cv_mingw32" = yes -o $ol_cv_msvc = yes ; then
2893
3068
        PLAT=NT
2894
3069
        SLAPD_MODULES_LDFLAGS=
2895
3070
else
2916
3091
  AC_SUBST(BUILD_LDAP)
2917
3092
  AC_SUBST(BUILD_META)
2918
3093
  AC_SUBST(BUILD_MONITOR)
 
3094
  AC_SUBST(BUILD_NDB)
2919
3095
  AC_SUBST(BUILD_NULL)
2920
3096
  AC_SUBST(BUILD_PASSWD)
2921
3097
  AC_SUBST(BUILD_RELAY)
2926
3102
dnl overlays
2927
3103
  AC_SUBST(BUILD_ACCESSLOG)
2928
3104
  AC_SUBST(BUILD_AUDITLOG)
 
3105
  AC_SUBST(BUILD_COLLECT)
2929
3106
  AC_SUBST(BUILD_CONSTRAINT)
2930
3107
  AC_SUBST(BUILD_DDS)
2931
3108
  AC_SUBST(BUILD_DENYOP)
2947
3124
AC_SUBST(LDAP_LIBS)
2948
3125
AC_SUBST(SLAPD_LIBS)
2949
3126
AC_SUBST(BDB_LIBS)
 
3127
AC_SUBST(SLAPD_NDB_LIBS)
 
3128
AC_SUBST(SLAPD_NDB_INCS)
2950
3129
AC_SUBST(LTHREAD_LIBS)
2951
3130
AC_SUBST(LUTIL_LIBS)
2952
3131
AC_SUBST(WRAP_LIBS)
2967
3146
AC_SUBST(KRB4_LIBS)
2968
3147
AC_SUBST(KRB5_LIBS)
2969
3148
AC_SUBST(SASL_LIBS)
 
3149
AC_SUBST(GSSAPI_LIBS)
2970
3150
AC_SUBST(TLS_LIBS)
2971
3151
AC_SUBST(MODULES_LIBS)
2972
3152
AC_SUBST(SLAPI_LIBS)
3017
3197
[servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk]
3018
3198
[servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk]
3019
3199
[servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk]
 
3200
[servers/slapd/back-ndb/Makefile:build/top.mk:servers/slapd/back-ndb/Makefile.in:build/mod.mk]
3020
3201
[servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk]
3021
3202
[servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk]
3022
3203
[servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk]
3040
3221
cat > $BACKENDSC << ENDX
3041
3222
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
3042
3223
 *
3043
 
 * Copyright 1998-2008 The OpenLDAP Foundation.
 
3224
 * Copyright 1998-2009 The OpenLDAP Foundation.
3044
3225
 * All rights reserved.
3045
3226
 *
3046
3227
 * Redistribution and use in source and binary forms, with or without
3091
3272
cat > $OVERLAYSC << ENDX
3092
3273
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
3093
3274
 *
3094
 
 * Copyright 1998-2008 The OpenLDAP Foundation.
 
3275
 * Copyright 1998-2009 The OpenLDAP Foundation.
3095
3276
 * All rights reserved.
3096
3277
 *
3097
3278
 * Redistribution and use in source and binary forms, with or without