apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r501536 - in /apr/apr-util/trunk: build/dbd.m4 dbd/apr_dbd.c
Date Tue, 30 Jan 2007 20:19:41 GMT
Author: bojan
Date: Tue Jan 30 12:19:40 2007
New Revision: 501536

URL: http://svn.apache.org/viewvc?view=rev&rev=501536
Log:
Some fixes for DBD DSO stuff

Modified:
    apr/apr-util/trunk/build/dbd.m4
    apr/apr-util/trunk/dbd/apr_dbd.c

Modified: apr/apr-util/trunk/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/dbd.m4?view=diff&rev=501536&r1=501535&r2=501536
==============================================================================
--- apr/apr-util/trunk/build/dbd.m4 (original)
+++ apr/apr-util/trunk/build/dbd.m4 Tue Jan 30 12:19:40 2007
@@ -370,7 +370,7 @@
   AC_ARG_ENABLE([dbd-dso], 
      APR_HELP_STRING([--enable-dbd-dso], [build DBD drivers as DSOs]))
 
-  if test $enable_dbd_dso = yes; then
+  if test "$enable_dbd_dso" = "yes"; then
      AC_DEFINE([APU_DSO_BUILD], 1, [Define if DBD drivers are built as DSOs])
      
      dsos=
@@ -392,7 +392,7 @@
      test $apu_have_sqlite3 = 1 && objs="$objs dbd/apr_dbd_sqlite3.lo"
      EXTRA_OBJECTS="$EXTRA_OBJECTS $objs"
 
-     APRUTIL_LIBS="$APRUTIL_LIBS '$(LDADD_dbd_pgsql) $(LDADD_dbd_sqlite2) $(LDADD_dbd_sqlite3)
$(LDADD_dbd_oracle) $(LDADD_dbd_mysql)'"
-     APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS '$(LDADD_dbd_pgsql) $(LDADD_dbd_sqlite2) $(LDADD_dbd_sqlite3)
$(LDADD_dbd_oracle) $(LDADD_dbd_mysql)'"
+     APRUTIL_LIBS="$APRUTIL_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle
$LDADD_dbd_mysql"
+     APRUTIL_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3
$LDADD_dbd_oracle $LDADD_dbd_mysql"
   fi
 ])

Modified: apr/apr-util/trunk/dbd/apr_dbd.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/dbd/apr_dbd.c?view=diff&rev=501536&r1=501535&r2=501536
==============================================================================
--- apr/apr-util/trunk/dbd/apr_dbd.c (original)
+++ apr/apr-util/trunk/dbd/apr_dbd.c Tue Jan 30 12:19:40 2007
@@ -121,7 +121,7 @@
 #define dbd_drivers_unlock(m) apr_thread_mutex_unlock(m)
 #else
 #define dbd_drivers_lock(m) APR_SUCCESS
-#define dbd_drivers_unlock(m) APR_SUCCESS
+#define dbd_drivers_unlock(m)
 #endif
 
 APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,



Mime
View raw message