kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 288638 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288638 | tilghman | 2010-09-23 22:39:29 -0500 (Thu, 23 Sep 2010) | 16 lines
  
  Merged revisions 288637 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r288637 | tilghman | 2010-09-23 22:36:01 -0500 (Thu, 23 Sep 2010) | 9 lines
    
    Merged revisions 288636 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r288636 | tilghman | 2010-09-23 22:20:24 -0500 (Thu, 23 Sep 2010) | 2 lines
      
      Solaris compatibility fixes
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-09-24 03:41:02 +00:00
parent cfe811bb35
commit f8180257e0
7 changed files with 101 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@@ -1697,6 +1697,19 @@ if test "${PG_CONFIG}" != No; then
AC_CHECK_LIB([pq], [PQescapeStringConn], AC_DEFINE_UNQUOTED([HAVE_PGSQL], 1,
[Define to indicate the PostgreSQL library]), [], -L${PGSQL_libdir} -lz)
AC_MSG_CHECKING(for pg_encoding_to_char within Postgres headers)
old_CFLAGS=${CFLAGS}
CFLAGS="${CFLAGS} -I${PGSQL_includedir} -Werror"
old_LDFLAGS=${LDFLAGS}
LDFLAGS="${LDFLAGS} -L${PGSQL_libdir} -lpq -lz"
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <libpq-fe.h>],
[const char *foo = pg_encoding_to_char(1)])],
[AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED([HAVE_PGSQL_pg_encoding_to_char], 1, [Define to indicate presence of the pg_encoding_to_char API.])],
[AC_MSG_RESULT(no)])
CFLAGS=${old_CFLAGS}
LDFLAGS=${old_LDFLAGS}
if test "${ac_cv_lib_pq_PQescapeStringConn}" = "yes"; then
PGSQL_LIB="-L${PGSQL_libdir} -lpq -lz"
PGSQL_INCLUDE="-I${PGSQL_includedir}"