kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6796
configure vendored
View File

File diff suppressed because it is too large Load Diff

10
configure.ac
View File

@@ -737,6 +737,15 @@ if test "${PG_CONFIG}" != No; then
PGSQL_libdir=`${PG_CONFIG} --libdir` PGSQL_libdir=`${PG_CONFIG} --libdir`
PGSQL_includedir=`${PG_CONFIG} --includedir` 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, AC_CHECK_LIB([pq], [PQexec], AC_DEFINE_UNQUOTED([HAVE_PGSQL], 1,
[Define to indicate the PostgreSQL library]), [], -L${PGSQL_libdir} -lz) [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]) AC_MSG_NOTICE([*** including --without-postgres])
exit 1 exit 1
fi fi
fi
elif test -n "${PGSQL_MANDATORY}"; elif test -n "${PGSQL_MANDATORY}";
then then
AC_MSG_NOTICE([***]) AC_MSG_NOTICE([***])

3
include/asterisk/autoconfig.h.in
View File

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