apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r719497 - /apr/apr-util/branches/1.3.x/build/dso.m4
Date Fri, 21 Nov 2008 06:15:00 GMT
Author: wrowe
Date: Thu Nov 20 22:15:00 2008
New Revision: 719497

URL: http://svn.apache.org/viewvc?rev=719497&view=rev
Log:
Ensure APU_DSO_BUILD on Unix is always defined, and binary [0 or 1]

Backports: 719495

Modified:
    apr/apr-util/branches/1.3.x/build/dso.m4

Modified: 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=719497&r1=719496&r2=719497&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/build/dso.m4 (original)
+++ apr/apr-util/branches/1.3.x/build/dso.m4 Thu Nov 20 22:15:00 2008
@@ -24,12 +24,16 @@
      APR_HELP_STRING([--disable-util-dso],
        [disable DSO build of modular components (dbd, ldap)]))
 
-  apr_h=`$apr_config --includedir`/apr.h
-  aprdso=`awk '/^#define APR_HAS_DSO/ { print @S|@3; }' $apr_h`
+  if test "$enable_util_dso" = "no"; then
+     apu_dso_build="0"
+  else
+     apr_h="`$apr_config --includedir`/apr.h"
+     apu_dso_build="`awk '/^#define APR_HAS_DSO/ { print @S|@3; }' $apr_h`"
+  fi
 
-  if test "$enable_util_dso" = "no" || "$aprdso" = "0"; then
-     # Statically link the DBD drivers:
+  if test "$apu_dso_build" = "0"; then
 
+     # Statically link the 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"
@@ -61,9 +65,10 @@
      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 $LDADD_dbd_odbc"
      APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_ldap"
+
   else
-     AC_DEFINE([APU_DSO_BUILD], 1, [Define if modular components are built as DSOs])
-     
+
+     # Build the drivers as loadable modules:
      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"
@@ -77,5 +82,9 @@
      if test -n "$dsos"; then
         APU_MODULES="$APU_MODULES $dsos"
      fi
+
   fi
+
+  AC_DEFINE_UNQUOTED([APU_DSO_BUILD], $apu_dso_build,
+     [Define to 1 if modular components are built as DSOs])
 ])



Mime
View raw message