apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r659586 - in /apr/apr-util/branches/1.3.x: CHANGES build/dbd.m4 build/dso.m4 configure.in
Date Fri, 23 May 2008 16:32:27 GMT
Author: wrowe
Date: Fri May 23 09:32:27 2008
New Revision: 659586

URL: http://svn.apache.org/viewvc?rev=659586&view=rev
Log:
Abstract "--disable-dbd-dso" into "--disable-util-dso"; since the 
prior --enable-dbd-dso is now default, this is a noop for existing 
./config.nice settings, and --disable-dbd-dso was previously the
default and therefore unexpected.

Backports: r659585

Added:
    apr/apr-util/branches/1.3.x/build/dso.m4
Modified:
    apr/apr-util/branches/1.3.x/CHANGES
    apr/apr-util/branches/1.3.x/build/dbd.m4
    apr/apr-util/branches/1.3.x/configure.in

Modified: apr/apr-util/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=659586&r1=659585&r2=659586&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Fri May 23 09:32:27 2008
@@ -7,6 +7,9 @@
      (in addition to the usual linker queries for compiling and linking).
      [William Rowe]
 
+  *) Support building DBD drivers as DSOs by default; use --disable-util-dso
+     flag to configure to use static link.  [Joe Orton, Bojan Smojver]
+
   *) All DBD drivers now count rows from 1, which affects PostgreSQL and MySQL
      drivers in particular. Using row number zero is an error.
      [Bojan Smojver]
@@ -58,9 +61,6 @@
   *) Unify parsing of prepared statements and add binary argument functions
      to DBD [Bojan Smojver with help from many on the APR list]
 
-  *) Support building DBD drivers as DSOs by default; use --disable-dbd-dso
-     flag to configure to use static link.  [Joe Orton, Bojan Smojver]
-
   *) Rewrite detection of expat in configure to fix build on e.g. biarch
      Linux platforms.  PR 28205.  [Joe Orton]
 

Modified: apr/apr-util/branches/1.3.x/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/build/dbd.m4?rev=659586&r1=659585&r2=659586&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/build/dbd.m4 (original)
+++ apr/apr-util/branches/1.3.x/build/dbd.m4 Fri May 23 09:32:27 2008
@@ -387,54 +387,3 @@
 ])
 dnl
 
-AC_DEFUN([APU_CHECK_DBD_DSO], [
-
-  AC_ARG_ENABLE([dbd-dso], 
-     APR_HELP_STRING([--disable-dbd-dso], [disable DSO build of DBD drivers]))
-
-  if test "$enable_dbd_dso" = "no"; then
-     # Statically link the DBD drivers:
-
-     objs=
-     test $apu_have_oracle = 1 && objs="$objs dbd/apr_dbd_oracle.lo"
-     test $apu_have_pgsql = 1 && objs="$objs dbd/apr_dbd_pgsql.lo"
-     test $apu_have_mysql = 1 && objs="$objs dbd/apr_dbd_mysql.lo"
-     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
-     if test $apu_have_mysql = 1; then
-       for flag in $LDADD_dbd_mysql
-       do
-         dir=`echo $flag | grep "^-L" | sed s:-L::`
-         if test "x$dir" != 'x'; then
-           if test -f "$dir/libmysqlclient_r.la"; then
-             LDADD_dbd_mysql=$dir/libmysqlclient_r.la
-             break
-           fi
-         fi
-       done
-     fi
-
-     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])
-     
-     dsos=
-     test $apu_have_oracle = 1 && dsos="$dsos dbd/apr_dbd_oracle.la"
-     test $apu_have_pgsql = 1 && dsos="$dsos dbd/apr_dbd_pgsql.la"
-     test $apu_have_mysql = 1 && dsos="$dsos dbd/apr_dbd_mysql.la"
-     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
-])

Added: apr/apr-util/branches/1.3.x/build/dso.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/build/dso.m4?rev=659586&view=auto
==============================================================================
--- apr/apr-util/branches/1.3.x/build/dso.m4 (added)
+++ apr/apr-util/branches/1.3.x/build/dso.m4 Fri May 23 09:32:27 2008
@@ -0,0 +1,74 @@
+dnl -------------------------------------------------------- -*- autoconf -*-
+dnl Copyright 2005 The Apache Software Foundation or its licensors, as
+dnl applicable.
+dnl
+dnl Licensed under the Apache License, Version 2.0 (the "License");
+dnl you may not use this file except in compliance with the License.
+dnl You may obtain a copy of the License at
+dnl
+dnl     http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
+
+dnl
+dnl DSO module
+dnl
+
+AC_DEFUN([APU_CHECK_UTIL_DSO], [
+
+  AC_ARG_ENABLE([util-dso], 
+     APR_HELP_STRING([--disable-util-dso],
+       [disable DSO build of modular components (dbd, ldap)]))
+
+  if test "$enable_util_dso" = "no"; then
+     # Statically link the DBD drivers:
+
+     objs=
+     test $apu_have_oracle = 1 && objs="$objs dbd/apr_dbd_oracle.lo"
+     test $apu_have_pgsql = 1 && objs="$objs dbd/apr_dbd_pgsql.lo"
+     test $apu_have_mysql = 1 && objs="$objs dbd/apr_dbd_mysql.lo"
+     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
+     if test $apu_have_mysql = 1; then
+       for flag in $LDADD_dbd_mysql
+       do
+         dir=`echo $flag | grep "^-L" | sed s:-L::`
+         if test "x$dir" != 'x'; then
+           if test -f "$dir/libmysqlclient_r.la"; then
+             LDADD_dbd_mysql=$dir/libmysqlclient_r.la
+             break
+           fi
+         fi
+       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_LIBS="$APRUTIL_LIBS $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"
+     APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_ldap"
+  else
+     AC_DEFINE([APU_DSO_BUILD], 1, [Define if modular components are built as DSOs])
+     
+     dsos=
+     test $apu_have_oracle = 1 && dsos="$dsos dbd/apr_dbd_oracle.la"
+     test $apu_have_pgsql = 1 && dsos="$dsos dbd/apr_dbd_pgsql.la"
+     test $apu_have_mysql = 1 && dsos="$dsos dbd/apr_dbd_mysql.la"
+     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
+])

Modified: apr/apr-util/branches/1.3.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/configure.in?rev=659586&r1=659585&r2=659586&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/configure.in (original)
+++ apr/apr-util/branches/1.3.x/configure.in Fri May 23 09:32:27 2008
@@ -15,6 +15,7 @@
 sinclude(build/find_apr.m4)
 sinclude(build/dbm.m4)
 sinclude(build/dbd.m4)
+sinclude(build/dso.m4)
 
 dnl Generate ./config.nice for reproducing runs of configure
 dnl 
@@ -160,7 +161,7 @@
 APU_FIND_ICONV
 
 dnl Enable DSO build; must be last:
-APU_CHECK_DBD_DSO
+APU_CHECK_UTIL_DSO
 
 AC_SEARCH_LIBS(crypt, crypt ufc)
 AC_MSG_CHECKING(if system crypt() function is threadsafe)



Mime
View raw message