Kaydet (Commit) 6d471576 authored tarafından Tomáš Chvátal's avatar Tomáš Chvátal Kaydeden (comit) Tomáš Chvátal

Use pkgconfig to detect PostgreSQL if there is no pg_config

pg_config is meant for linking server extensions,
clients should use pkg-config instead to build against libpq.

This fixes build with PostgreSQL 11.

Change-Id: Ic0b5fc9cb7169f44c00a1edf7218212c360ec235
Reviewed-on: https://gerrit.libreoffice.org/68734
Tested-by: Jenkins
Reviewed-by: 's avatarTomáš Chvátal <tchvatal@suse.cz>
üst 5a226c97
......@@ -8814,11 +8814,17 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
done
fi
AC_PATH_PROG(PGCONFIG, pg_config, ,$PATH$pg_supp_path)
if test -z "$PGCONFIG"; then
AC_MSG_ERROR([pg_config needed; set PGCONFIG if not in PATH])
if test -n "$PGCONFIG"; then
POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)"
else
PKG_CHECK_MODULES(POSTGRESQL, libpq, [
POSTGRESQL_INC=$POSTGRESQL_CFLAGS
POSTGRESQL_LIB=$POSTGRESQL_LIBS
],[
AC_MSG_ERROR([pg_config or 'pkg-config libpq' needed; set PGCONFIG if not in PATH])
])
fi
POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)"
FilterLibs "${POSTGRESQL_LIB}"
POSTGRESQL_LIB="${filteredlibs}"
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment