diff options
| author | jfclere <jfclere@13f79535-47bb-0310-9956-ffa450edef68> | 2007-09-21 09:19:37 +0000 |
|---|---|---|
| committer | jfclere <jfclere@13f79535-47bb-0310-9956-ffa450edef68> | 2007-09-21 09:19:37 +0000 |
| commit | 40d68dbd123b87c1c6fab6b4d24c2b771989af27 (patch) | |
| tree | 095bf22cab84311ce5d0943b4f9a86b9afff1889 /build | |
| parent | 604b861f6b8976527232117f43003eeacb98b797 (diff) | |
| download | libapr-util-40d68dbd123b87c1c6fab6b4d24c2b771989af27.tar.gz | |
Rollback r577654 and replace it by a better logic.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@578028 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/dbd.m4 | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/build/dbd.m4 b/build/dbd.m4 index 285df326..861267fc 100644 --- a/build/dbd.m4 +++ b/build/dbd.m4 @@ -134,12 +134,6 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ 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" @@ -164,12 +158,6 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ 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 @@ -455,6 +443,20 @@ AC_DEFUN([APU_CHECK_DBD_DSO], [ test $apu_have_freetds = 1 && objs="$objs dbd/apr_dbd_freetds.lo" EXTRA_OBJECTS="$EXTRA_OBJECTS $objs" + # Use libtool *.la for mysql if available + if test $apu_have_mysql = 1; then + for flag in $mysql_LDFLAGS + do + dir=`echo $flag | grep "^-L" | sed s:-L::` + if test "x$dir" != 'x'; then + if test -f "$dir/libmysqlclient_r.la"; then + mysql_LDFLAGS=$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_EXPORT_LIBS="$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql $LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql $LDADD_dbd_freetds" fi |