ITS#3616 don't index the dummy context entry

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index 8db0d86b6e9818b0cb0b53e70935da6fd31bd514..07384b14a1f4e13f4a52d516338776f59c603aa9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -242,8 +242,8 @@ OL_ARG_ENABLE(sql,[    --enable-sql   enable sql backend no|yes|mod],
 
 dnl ----------------------------------------------------------------
 dnl SLAPD Overlay Options
-Overlays="denyop dyngroup glue lastmod ppolicy proxycache rwm \
-       refint syncprov translucent unique"
+Overlays="denyop dyngroup dynlist glue lastmod ppolicy proxycache \
+       refint rwm syncprov translucent unique"
 
 AC_ARG_WITH(xxslapoverlays,[
 SLAPD Overlay Options:])
@@ -254,6 +254,8 @@ OL_ARG_ENABLE(denyop,[    --enable-denyop     Deny Operation overlay no|yes|mod]
        no, [no yes mod])
 OL_ARG_ENABLE(dyngroup,[    --enable-dyngroup    Dynamic Group overlay no|yes|mod],
        no, [no yes mod])
+OL_ARG_ENABLE(dynlist,[    --enable-dynlist      Dynamic List overlay no|yes|mod],
+       no, [no yes mod])
 OL_ARG_ENABLE(glue,[    --enable-glue    Backend Glue overlay no|yes|mod],
        yes, [no yes mod])
 OL_ARG_ENABLE(lastmod,[    --enable-lastmod      Last Modification overlay no|yes|mod],
@@ -523,6 +525,7 @@ BUILD_SQL=no
 BUILD_CHAIN=no
 BUILD_DENYOP=no
 BUILD_DYNGROUP=no
+BUILD_DYNLIST=no
 BUILD_GLUE=no
 BUILD_LASTMOD=no
 BUILD_PPOLICY=no
@@ -976,7 +979,7 @@ if test "$ol_cv_lib_resolver" != no ; then
                [define if you have res_query()])
 
        if test "$ol_enable_dnssrv" != no ; then
-               ol_link_dnssrv=yes;
+               ol_link_dnssrv=yes
        fi
 
        if test "$ol_cv_lib_resolver" != yes ; then
@@ -984,8 +987,10 @@ if test "$ol_cv_lib_resolver" != no ; then
        fi
 fi
 
-if test "$ol_enable_dnssrv" = yes -a "$ol_link_dnssrv" = no ; then
-       AC_MSG_ERROR([DNSSRV requires res_query()])
+if test "$ol_enable_dnssrv" = yes -o "$ol_enable_dnssrv" = mod ; then
+       if test "$ol_link_dnssrv" = no ; then
+               AC_MSG_ERROR([DNSSRV requires res_query()])
+       fi
 else
        ol_enable_dnssrv=no
 fi
@@ -2069,6 +2074,9 @@ if test $ol_enable_sql != no ; then
                AC_MSG_ERROR([could not locate SQL headers])
        ])
 
+       sql_LIBS="$LIBS"
+       LIBS="$LTHREAD_LIBS"
+
        AC_CHECK_LIB(iodbc,SQLDriverConnect,[have_iodbc=yes],[have_iodbc=no])
        if test $have_iodbc = yes ; then
                ol_link_sql="-liodbc"
@@ -2079,6 +2087,8 @@ if test $ol_enable_sql != no ; then
                fi
        fi
 
+       LIBS="$sql_LIBS"
+
        if test $ol_link_sql != no ; then
                SLAPD_SQL_LIBS="$ol_link_sql"
 
@@ -2776,6 +2786,17 @@ if test "$ol_enable_dyngroup" != no ; then
        AC_DEFINE_UNQUOTED(SLAPD_OVER_DYNGROUP,$MFLAG,[define for Dynamic Group overlay])
 fi
 
+if test "$ol_enable_dynlist" != no ; then
+       BUILD_DYNLIST=$ol_enable_dynlist
+       if test "$ol_enable_dynlist" = mod ; then
+               MFLAG=SLAPD_MOD_DYNAMIC
+               SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS dynlist.la"
+       else
+               MFLAG=SLAPD_MOD_STATIC
+       fi
+       AC_DEFINE_UNQUOTED(SLAPD_OVER_DYNLIST,$MFLAG,[define for Dynamic List overlay])
+fi
+
 if test "$ol_enable_glue" != no ; then
        BUILD_GLUE=$ol_enable_glue
        if test "$ol_enable_glue" = mod ; then
@@ -2935,6 +2956,7 @@ dnl overlays
   AC_SUBST(BUILD_CHAIN)
   AC_SUBST(BUILD_DENYOP)
   AC_SUBST(BUILD_DYNGROUP)
+  AC_SUBST(BUILD_DYNLIST)
   AC_SUBST(BUILD_GLUE)
   AC_SUBST(BUILD_LASTMOD)
   AC_SUBST(BUILD_PPOLICY)