kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[build] fix postgres detection on osx

This commit is contained in:
Mike Jerris 2022-05-19 14:32:50 -06:00
parent 663ac586d1
commit 56ed4bbf55
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -665,12 +665,13 @@ AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
case $host in case $host in
*-darwin*) *-darwin*)
path_push_unique PKG_CONFIG_PATH /usr/local/opt/libpq/lib/pkgconfig path_push_unique PKG_CONFIG_PATH /usr/local/opt/libpq/lib/pkgconfig
path_push_unique PKG_CONFIG_PATH /usr/local/opt/openssl/lib/pkgconfig
;; ;;
esac esac
if test "$PKG_CONFIG" = "no" \ if test "$PKG_CONFIG" = "no" \
|| test x"$enable_core_pgsql_pkgconfig" = x"no" \ || test x"$enable_core_pgsql_pkgconfig" = x"no" \
|| ! pkg-config libpq; then || ! pkg-config --modversion libpq > /dev/null; then
if test "$PG_CONFIG" != "no"; then if test "$PG_CONFIG" != "no"; then
AC_MSG_CHECKING([for PostgreSQL libraries via pg_config]) AC_MSG_CHECKING([for PostgreSQL libraries via pg_config])
POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`" POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`"
@ -682,7 +683,6 @@ if test "$PKG_CONFIG" = "no" \
POSTGRESQL_PATCH_VERSION=`$PG_CONFIG --version | awk '{ print $NF }' | awk -F. '{ print $3 }'` POSTGRESQL_PATCH_VERSION=`$PG_CONFIG --version | awk '{ print $NF }' | awk -F. '{ print $3 }'`
fi fi
else else
AC_MSG_CHECKING([for PostgreSQL libraries via pkg_config]) AC_MSG_CHECKING([for PostgreSQL libraries via pkg_config])
POSTGRESQL_CFLAGS="`$PKG_CONFIG --cflags libpq`" POSTGRESQL_CFLAGS="`$PKG_CONFIG --cflags libpq`"
POSTGRESQL_LIBDIR="`$PKG_CONFIG libpq --libs-only-L`" POSTGRESQL_LIBDIR="`$PKG_CONFIG libpq --libs-only-L`"