You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@apr.apache.org by Bojan Smojver <bo...@rexursive.com> on 2008/05/23 03:04:56 UTC
Re: svn commit: r659293 - in /apr/apr-util/trunk: ./ build/ dbd/
include/ include/private/ ldap/ misc/ test/
On Thu, 2008-05-22 at 22:37 +0000, wrowe@apache.org wrote:
> Modified: apr/apr-util/trunk/build/dbd.m4
> URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/dbd.m4?rev=659293&r1=659292&r2=659293&view=diff
> ==============================================================================
> --- apr/apr-util/trunk/build/dbd.m4 (original)
> +++ apr/apr-util/trunk/build/dbd.m4 Thu May 22 15:37:19 2008
> @@ -402,6 +402,9 @@
> test $apu_have_sqlite2 = 1 && objs="$objs dbd/apr_dbd_sqlite2.lo"
> test $apu_have_sqlite3 = 1 && objs="$objs dbd/apr_dbd_sqlite3.lo"
> test $apu_have_freetds = 1 && objs="$objs dbd/apr_dbd_freetds.lo"
> + test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_init.lo"
> + test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_option.lo"
> + test $apu_has_ldap = 1 && objs="$objs ldap/apr_ldap_rebind.lo"
> EXTRA_OBJECTS="$EXTRA_OBJECTS $objs"
>
> # Use libtool *.la for mysql if available
> @@ -418,8 +421,8 @@
> done
> fi
>
> - APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds"
> - APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds"
> + APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds $LDADD_ldap"
> + APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds $LDADD_ldap"
> else
> AC_DEFINE([APU_DSO_BUILD], 1, [Define if DBD drivers are built as DSOs])
>
> @@ -430,6 +433,7 @@
> test $apu_have_sqlite2 = 1 && dsos="$dsos dbd/apr_dbd_sqlite2.la"
> test $apu_have_sqlite3 = 1 && dsos="$dsos dbd/apr_dbd_sqlite3.la"
> test $apu_have_freetds = 1 && dsos="$dsos dbd/apr_dbd_freetds.la"
> + test $apu_has_ldap = 1 && dsos="$dsos ldap/apr_ldap.la"
>
> APU_MODULES="$APU_MODULES $dsos"
> fi
Shouldn't all this stuff now go into something like build/dso.m4, with
option called --disable-load-dso or something?
I think people may get confused by mixing DBD and LDAP. Or was this
intentional?
--
Bojan
Re: svn commit: r659293 - in /apr/apr-util/trunk: ./ build/ dbd/
include/ include/private/ ldap/ misc/ test/
Posted by Bojan Smojver <bo...@rexursive.com>.
On Thu, 2008-05-22 at 20:23 -0500, William A. Rowe, Jr. wrote:
> I'll pull this as part of the dbm separation, as a matter of fact I already
> had a build/dso.m4 in the tree here :)
Cool.
--
Bojan
Re: svn commit: r659293 - in /apr/apr-util/trunk: ./ build/ dbd/
include/ include/private/ ldap/ misc/ test/
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
>> @@ -430,6 +433,7 @@
>> test $apu_have_sqlite2 = 1 && dsos="$dsos dbd/apr_dbd_sqlite2.la"
>> test $apu_have_sqlite3 = 1 && dsos="$dsos dbd/apr_dbd_sqlite3.la"
>> test $apu_have_freetds = 1 && dsos="$dsos dbd/apr_dbd_freetds.la"
>> + test $apu_has_ldap = 1 && dsos="$dsos ldap/apr_ldap.la"
>>
>> APU_MODULES="$APU_MODULES $dsos"
>> fi
>
> Shouldn't all this stuff now go into something like build/dso.m4, with
> option called --disable-load-dso or something?
I agree, but you'll notice from my prior commits I tried to reduce the final
size of this patch to make it easier to review...
> I think people may get confused by mixing DBD and LDAP. Or was this
> intentional?
I'll pull this as part of the dbm separation, as a matter of fact I already
had a build/dso.m4 in the tree here :)