If the pg_config application is found, but there is probably executing it,

then consider postgres unavailable.  (issue #8637)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@55052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-02-17 00:40:34 +00:00
parent 4b6558fb6b
commit 137835c878
3 changed files with 5297 additions and 1586 deletions

6796
configure vendored

File diff suppressed because it is too large Load Diff

View File

@@ -737,6 +737,15 @@ if test "${PG_CONFIG}" != No; then
PGSQL_libdir=`${PG_CONFIG} --libdir`
PGSQL_includedir=`${PG_CONFIG} --includedir`
if test "x$?" != "x0" ; then
if test -n "${PGSQL_MANDATORY}" ; then
AC_MSG_NOTICE([***])
AC_MSG_NOTICE([*** The PostgreSQL installation on this system appears to be broken.])
AC_MSG_NOTICE([*** Either correct the installation, or run configure])
AC_MSG_NOTICE([*** including --without-postgres])
exit 1
fi
else
AC_CHECK_LIB([pq], [PQexec], AC_DEFINE_UNQUOTED([HAVE_PGSQL], 1,
[Define to indicate the PostgreSQL library]), [], -L${PGSQL_libdir} -lz)
@@ -752,6 +761,7 @@ if test "${PG_CONFIG}" != No; then
AC_MSG_NOTICE([*** including --without-postgres])
exit 1
fi
fi
elif test -n "${PGSQL_MANDATORY}";
then
AC_MSG_NOTICE([***])

View File

@@ -593,9 +593,6 @@
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES