mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check for krb5/gssapi only when we use internal libpq

Browse Source 
Change-Id: I654b4bd7dbd3cb6b6e09196a80097eae2a5787a1
This commit is contained in:
Rene Engelhard
2013-03-18 11:34:22 +01:00
parent cf284036ed
commit df2e3d29a4
1 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
configure.ac
View File

@@ -7662,6 +7662,23 @@ dnl ===================================================================
if test "x$enable_postgresql_sdbc" != "xno"; then
SCPDEFS="$SCPDEFS -DWITH_POSTGRESQL_SDBC"
AC_MSG_CHECKING([PostgreSQL C interface])
if test "$with_system_postgresql" = "yes"; then
AC_MSG_RESULT([external PostgreSQL])
SYSTEM_POSTGRESQL=YES
if test "$_os" = Darwin; then
supp_path=''
for d in /Library/PostgreSQL/9.*/bin /sw/opt/postgresql/9.*/bin /opt/local/lib/postgresql9*/bin; do
pg_supp_path="$P_SEP$d$pg_supp_path"
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])
fi
POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)"
else
# if/when anything else than PostgreSQL uses Kerberos,
# move this out of `test "x$enable_postgresql_sdbc" != "xno"'
WITH_KRB5=NO
@@ -7731,23 +7748,6 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
fi
esac
AC_MSG_CHECKING([PostgreSQL C interface])
if test "$with_system_postgresql" = "yes"; then
AC_MSG_RESULT([external PostgreSQL])
SYSTEM_POSTGRESQL=YES
if test "$_os" = Darwin; then
supp_path=''
for d in /Library/PostgreSQL/9.*/bin /sw/opt/postgresql/9.*/bin /opt/local/lib/postgresql9*/bin; do
pg_supp_path="$P_SEP$d$pg_supp_path"
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])
fi
POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)"
else
if test -n "$with_libpq_path"; then
SYSTEM_POSTGRESQL=YES
AC_MSG_RESULT([external libpq])