From 81ef033641978db01efa6bada613df13a9571bbd Mon Sep 17 00:00:00 2001 From: bojan Date: Jul 02 2008 06:50:16 +0000 Subject: Properly fix PostgreSQL detection. --- diff --git a/apr-util-1.3.2-pgsql.patch b/apr-util-1.3.2-pgsql.patch index 6d29f0b..c0a46d1 100644 --- a/apr-util-1.3.2-pgsql.patch +++ b/apr-util-1.3.2-pgsql.patch @@ -2,12 +2,118 @@ Index: build/dbd.m4 =================================================================== --- build/dbd.m4 (revision 672960) +++ build/dbd.m4 (working copy) -@@ -35,7 +35,7 @@ +@@ -35,16 +35,32 @@ if test "x$PGSQL_CONFIG" != 'x'; then pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" - pgsql_LIBS="`$PGSQL_CONFIG --libs`" -+ pgsql_LIBS="" APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) +- APR_ADDTO(LIBS, [$pgsql_LIBS]) + fi + +- AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) ++ AC_CHECK_HEADERS(libpq-fe.h, [ ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ unset ac_cv_lib_pq_PQsendQueryPrepared ++ pgsql_LIBS="`$PGSQL_CONFIG --libs`" ++ APR_ADDTO(LIBS, [$pgsql_LIBS]) ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) ++ fi ++ ]) ++ ]) + if test "$apu_have_pgsql" = "0"; then +- AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) ++ AC_CHECK_HEADERS(postgresql/libpq-fe.h, [ ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ unset ac_cv_lib_pq_PQsendQueryPrepared ++ pgsql_LIBS="`$PGSQL_CONFIG --libs`" ++ APR_ADDTO(LIBS, [$pgsql_LIBS]) ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) ++ fi ++ ]) ++ ]) + fi + if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then + APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS]) +@@ -56,7 +72,6 @@ + if test "x$PGSQL_CONFIG" != 'x'; then + pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" + pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" +- pgsql_LIBS="`$PGSQL_CONFIG --libs`" + else + pgsql_CPPFLAGS="-I$withval/include" + pgsql_LDFLAGS="-L$withval/lib " +@@ -64,12 +79,29 @@ + + APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) + APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) +- APR_ADDTO(LIBS, [$pgsql_LIBS]) + + AC_MSG_NOTICE(checking for pgsql in $withval) +- AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) ++ AC_CHECK_HEADERS(libpq-fe.h, [ ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ unset ac_cv_lib_pq_PQsendQueryPrepared ++ pgsql_LIBS="`$PGSQL_CONFIG --libs`" ++ APR_ADDTO(LIBS, [$pgsql_LIBS]) ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) ++ fi ++ ]) ++ ]) + if test "$apu_have_pgsql" != "1"; then +- AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) ++ AC_CHECK_HEADERS(postgresql/libpq-fe.h, [ ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ unset ac_cv_lib_pq_PQsendQueryPrepared ++ pgsql_LIBS="`$PGSQL_CONFIG --libs`" ++ APR_ADDTO(LIBS, [$pgsql_LIBS]) ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) ++ fi ++ ]) ++ ]) + fi + if test "$apu_have_pgsql" != "0"; then + APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS]) +@@ -80,16 +112,32 @@ + if test "x$PGSQL_CONFIG" != 'x'; then + pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" + pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" +- pgsql_LIBS="`$PGSQL_CONFIG --libs`" + + APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) + APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) +- APR_ADDTO(LIBS, [$pgsql_LIBS]) + fi + +- AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) ++ AC_CHECK_HEADERS(libpq-fe.h, [ ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ unset ac_cv_lib_pq_PQsendQueryPrepared ++ pgsql_LIBS="`$PGSQL_CONFIG --libs`" ++ APR_ADDTO(LIBS, [$pgsql_LIBS]) ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) ++ fi ++ ]) ++ ]) + if test "$apu_have_pgsql" = "0"; then +- AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) ++ AC_CHECK_HEADERS(postgresql/libpq-fe.h, [ ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ unset ac_cv_lib_pq_PQsendQueryPrepared ++ pgsql_LIBS="`$PGSQL_CONFIG --libs`" ++ APR_ADDTO(LIBS, [$pgsql_LIBS]) ++ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]) ++ fi ++ ]) ++ ]) + fi + if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then + APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS]) diff --git a/apr-util.spec b/apr-util.spec index 7004181..50e59d2 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.3.2 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -183,6 +183,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jul 2 2008 Bojan Smojver - 1.3.2-4 +- properly fix PostgreSQL detection + * Wed Jul 2 2008 Bojan Smojver - 1.3.2-3 - revert build dependencies, change from -2 didn't help - add apr-util-1.3.2-pgsql.patch (remove pgsql_LIBS during detection)