(ITS#9535) -ldb incorrectly added to SLAPD_LIBS with modular build

[quanah@openldap.org]

Full_Name: Quanah Gibson-Mount
Version: 2.4.47
OS: N/A
URL: ftp://ftp.openldap.org/incoming/
Submission from: (NULL) (47.208.148.239)


configure.in has the following section handling the BDB library:

if test $ol_enable_bdb/$ol_enable_hdb != no/no; then
    OL_BERKELEY_DB

    if test $ol_cv_berkeley_db = no ; then
        AC_MSG_ERROR(BDB/HDB: BerkeleyDB not available)
    fi

    AC_DEFINE(HAVE_BERKELEY_DB,1,
        [define this if Berkeley DB is available])

    dnl $ol_cv_lib_db should be yes or -ldb
    dnl (it could be no, but that would be an error
    if test $ol_cv_lib_db != yes ; then
        BDB_LIBS="$BDB_LIBS $ol_cv_lib_db"
    fi

    SLAPD_LIBS="$SLAPD_LIBS \$(BDB_LIBS)"

    ol_link_bdb=yes
fi


This has the effect of always attempting to link the slapd binary with the BDB
library.  This block should instead be:

if test $ol_enable_bdb/$ol_enable_hdb != no/no; then
    OL_BERKELEY_DB

    if test $ol_cv_berkeley_db = no ; then
        AC_MSG_ERROR(BDB/HDB: BerkeleyDB not available)
    fi

    AC_DEFINE(HAVE_BERKELEY_DB,1,
        [define this if Berkeley DB is available])

    dnl $ol_cv_lib_db should be yes or -ldb
    dnl (it could be no, but that would be an error
    if test $ol_cv_lib_db != yes ; then
        BDB_LIBS="$BDB_LIBS $ol_cv_lib_db"
    fi

    dnl link BDB library to slapd with static backend
    if test $ol_enable_bdb/$ol_enable_hdb != mod/mod; then
        SLAPD_LIBS="$SLAPD_LIBS \$(BDB_LIBS)"
    fi

    ol_link_bdb=yes
fi