|
 |
4cc3fdb |
Index: build/dbd.m4
|
|
|
4cc3fdb |
===================================================================
|
|
|
4cc3fdb |
--- build/dbd.m4 (revision 672960)
|
|
|
4cc3fdb |
+++ build/dbd.m4 (working copy)
|
|
|
81ef033 |
@@ -35,16 +35,32 @@
|
|
|
4cc3fdb |
if test "x$PGSQL_CONFIG" != 'x'; then
|
|
|
4cc3fdb |
pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
|
|
|
4cc3fdb |
pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
|
|
|
4cc3fdb |
- pgsql_LIBS="`$PGSQL_CONFIG --libs`"
|
|
|
4cc3fdb |
|
|
|
4cc3fdb |
APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
|
|
|
4cc3fdb |
APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
|
|
|
81ef033 |
- APR_ADDTO(LIBS, [$pgsql_LIBS])
|
|
|
81ef033 |
fi
|
|
|
81ef033 |
|
|
|
81ef033 |
- AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
|
|
|
81ef033 |
+ AC_CHECK_HEADERS(libpq-fe.h, [
|
|
|
81ef033 |
+ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
|
|
|
81ef033 |
+ if test "x$PGSQL_CONFIG" != 'x'; then
|
|
|
81ef033 |
+ unset ac_cv_lib_pq_PQsendQueryPrepared
|
|
|
81ef033 |
+ pgsql_LIBS="`$PGSQL_CONFIG --libs`"
|
|
|
81ef033 |
+ APR_ADDTO(LIBS, [$pgsql_LIBS])
|
|
|
81ef033 |
+ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
|
|
|
81ef033 |
+ fi
|
|
|
81ef033 |
+ ])
|
|
|
81ef033 |
+ ])
|
|
|
81ef033 |
if test "$apu_have_pgsql" = "0"; then
|
|
|
81ef033 |
- AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
|
|
|
81ef033 |
+ AC_CHECK_HEADERS(postgresql/libpq-fe.h, [
|
|
|
81ef033 |
+ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
|
|
|
81ef033 |
+ if test "x$PGSQL_CONFIG" != 'x'; then
|
|
|
81ef033 |
+ unset ac_cv_lib_pq_PQsendQueryPrepared
|
|
|
81ef033 |
+ pgsql_LIBS="`$PGSQL_CONFIG --libs`"
|
|
|
81ef033 |
+ APR_ADDTO(LIBS, [$pgsql_LIBS])
|
|
|
81ef033 |
+ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
|
|
|
81ef033 |
+ fi
|
|
|
81ef033 |
+ ])
|
|
|
81ef033 |
+ ])
|
|
|
81ef033 |
fi
|
|
|
81ef033 |
if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then
|
|
|
81ef033 |
APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])
|
|
|
81ef033 |
@@ -56,7 +72,6 @@
|
|
|
81ef033 |
if test "x$PGSQL_CONFIG" != 'x'; then
|
|
|
81ef033 |
pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
|
|
|
81ef033 |
pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
|
|
|
81ef033 |
- pgsql_LIBS="`$PGSQL_CONFIG --libs`"
|
|
|
81ef033 |
else
|
|
|
81ef033 |
pgsql_CPPFLAGS="-I$withval/include"
|
|
|
81ef033 |
pgsql_LDFLAGS="-L$withval/lib "
|
|
|
81ef033 |
@@ -64,12 +79,29 @@
|
|
|
81ef033 |
|
|
|
81ef033 |
APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
|
|
|
81ef033 |
APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
|
|
|
81ef033 |
- APR_ADDTO(LIBS, [$pgsql_LIBS])
|
|
|
81ef033 |
|
|
|
81ef033 |
AC_MSG_NOTICE(checking for pgsql in $withval)
|
|
|
81ef033 |
- AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
|
|
|
81ef033 |
+ AC_CHECK_HEADERS(libpq-fe.h, [
|
|
|
81ef033 |
+ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
|
|
|
81ef033 |
+ if test "x$PGSQL_CONFIG" != 'x'; then
|
|
|
81ef033 |
+ unset ac_cv_lib_pq_PQsendQueryPrepared
|
|
|
81ef033 |
+ pgsql_LIBS="`$PGSQL_CONFIG --libs`"
|
|
|
81ef033 |
+ APR_ADDTO(LIBS, [$pgsql_LIBS])
|
|
|
81ef033 |
+ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
|
|
|
81ef033 |
+ fi
|
|
|
81ef033 |
+ ])
|
|
|
81ef033 |
+ ])
|
|
|
81ef033 |
if test "$apu_have_pgsql" != "1"; then
|
|
|
81ef033 |
- AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
|
|
|
81ef033 |
+ AC_CHECK_HEADERS(postgresql/libpq-fe.h, [
|
|
|
81ef033 |
+ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
|
|
|
81ef033 |
+ if test "x$PGSQL_CONFIG" != 'x'; then
|
|
|
81ef033 |
+ unset ac_cv_lib_pq_PQsendQueryPrepared
|
|
|
81ef033 |
+ pgsql_LIBS="`$PGSQL_CONFIG --libs`"
|
|
|
81ef033 |
+ APR_ADDTO(LIBS, [$pgsql_LIBS])
|
|
|
81ef033 |
+ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
|
|
|
81ef033 |
+ fi
|
|
|
81ef033 |
+ ])
|
|
|
81ef033 |
+ ])
|
|
|
81ef033 |
fi
|
|
|
81ef033 |
if test "$apu_have_pgsql" != "0"; then
|
|
|
81ef033 |
APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])
|
|
|
81ef033 |
@@ -80,16 +112,32 @@
|
|
|
81ef033 |
if test "x$PGSQL_CONFIG" != 'x'; then
|
|
|
81ef033 |
pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`"
|
|
|
81ef033 |
pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`"
|
|
|
81ef033 |
- pgsql_LIBS="`$PGSQL_CONFIG --libs`"
|
|
|
81ef033 |
|
|
|
81ef033 |
APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS])
|
|
|
81ef033 |
APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])
|
|
|
81ef033 |
- APR_ADDTO(LIBS, [$pgsql_LIBS])
|
|
|
81ef033 |
fi
|
|
|
81ef033 |
|
|
|
81ef033 |
- AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
|
|
|
81ef033 |
+ AC_CHECK_HEADERS(libpq-fe.h, [
|
|
|
81ef033 |
+ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
|
|
|
81ef033 |
+ if test "x$PGSQL_CONFIG" != 'x'; then
|
|
|
81ef033 |
+ unset ac_cv_lib_pq_PQsendQueryPrepared
|
|
|
81ef033 |
+ pgsql_LIBS="`$PGSQL_CONFIG --libs`"
|
|
|
81ef033 |
+ APR_ADDTO(LIBS, [$pgsql_LIBS])
|
|
|
81ef033 |
+ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
|
|
|
81ef033 |
+ fi
|
|
|
81ef033 |
+ ])
|
|
|
81ef033 |
+ ])
|
|
|
81ef033 |
if test "$apu_have_pgsql" = "0"; then
|
|
|
81ef033 |
- AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1]))
|
|
|
81ef033 |
+ AC_CHECK_HEADERS(postgresql/libpq-fe.h, [
|
|
|
81ef033 |
+ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[
|
|
|
81ef033 |
+ if test "x$PGSQL_CONFIG" != 'x'; then
|
|
|
81ef033 |
+ unset ac_cv_lib_pq_PQsendQueryPrepared
|
|
|
81ef033 |
+ pgsql_LIBS="`$PGSQL_CONFIG --libs`"
|
|
|
81ef033 |
+ APR_ADDTO(LIBS, [$pgsql_LIBS])
|
|
|
81ef033 |
+ AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])
|
|
|
81ef033 |
+ fi
|
|
|
81ef033 |
+ ])
|
|
|
81ef033 |
+ ])
|
|
|
81ef033 |
fi
|
|
|
81ef033 |
if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then
|
|
|
81ef033 |
APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])
|