apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject svn commit: r577654 - /apr/apr-util/trunk/build/dbd.m4
Date Thu, 20 Sep 2007 09:39:27 GMT
Author: jfclere
Date: Thu Sep 20 02:39:27 2007
New Revision: 577654

URL: http://svn.apache.org/viewvc?rev=577654&view=rev
Log:
Use the mysql libtool library when available.
(Otherwise it breaks on one of the HP-UX where I am testing).

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

Modified: apr/apr-util/trunk/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/dbd.m4?rev=577654&r1=577653&r2=577654&view=diff
==============================================================================
--- apr/apr-util/trunk/build/dbd.m4 (original)
+++ apr/apr-util/trunk/build/dbd.m4 Thu Sep 20 02:39:27 2007
@@ -134,6 +134,12 @@
           APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql])
         fi
       fi
+      if test -f "$withval/lib/mysql/libmysqlclient_r.la"; then
+        mysql_LDFLAGS=$withval/lib/mysql/libmysqlclient_r.la
+      fi
+      if test -f "$withval/lib/libmysqlclient_r.la"; then
+        mysql_LDFLAGS=$withval/lib/libmysqlclient_r.la
+      fi
 
       CPPFLAGS="$old_cppflags"
       LDFLAGS="$old_ldflags"
@@ -158,6 +164,12 @@
     if test "$apu_have_mysql" != "0"; then
       if test "x$MYSQL_CONFIG" != 'x'; then
         APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
+        if test -f "$withval/lib/mysql/libmysqlclient_r.la"; then
+          mysql_LDFLAGS=$withval/lib/mysql/libmysqlclient_r.la
+        fi
+        if test -f "$withval/lib/libmysqlclient_r.la"; then
+          mysql_LDFLAGS=$withval/lib/libmysqlclient_r.la
+        fi
       fi
     fi
 



Mime
View raw message