diff --git a/apr-util-1.2.8-dbddso.patch b/apr-util-1.2.8-dbddso.patch index cb72ab1..836b65d 100644 --- a/apr-util-1.2.8-dbddso.patch +++ b/apr-util-1.2.8-dbddso.patch @@ -425,6 +425,14 @@ ]) dnl AC_DEFUN([APU_CHECK_DBD_MYSQL], [ +@@ -101,7 +101,6 @@ + else + if test "x$MYSQL_CONFIG" != 'x'; then + APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS]) +- APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS]) + fi + fi + @@ -122,7 +121,6 @@ AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) if test "$apu_have_mysql" != "0"; then @@ -433,6 +441,14 @@ fi if test "$apu_have_mysql" != "1"; then +@@ -135,7 +134,6 @@ + AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + if test "$apu_have_mysql" != "0"; then + APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql]) +- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + fi + fi + @@ -177,8 +174,9 @@ dnl Since we have already done the AC_CHECK_LIB tests, if we have it, dnl we know the library is there. diff --git a/apr-util.spec b/apr-util.spec index 94f6847..6bea306 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.2.12 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -145,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Mon Dec 3 2007 Jesse Keating - 1.2.12-2 +- remove all instances of MySQL flags being added to APRUTIL_LDFLAGS + * Tue Nov 27 2007 Jesse Keating - 1.2.12-1 - bump up to 1.2.12 - drop MySQL DBD driver, shipped upstream