[asterisk-commits] russell: branch group/res_config_ldap r72770 - /team/group/res_config_ldap/

[SVN commits to the Asterisk project]

Author: russell
Date: Sat Jun 30 11:55:38 2007
New Revision: 72770

URL: http://svn.digium.com/view/asterisk?view=rev&rev=72770
Log:
Merged revisions 72767 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r72767 | russell | 2007-06-30 11:53:25 -0500 (Sat, 30 Jun 2007) | 11 lines

Merged revisions 72766 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r72766 | russell | 2007-06-30 11:50:40 -0500 (Sat, 30 Jun 2007) | 3 lines

Tweak the configure script so that error output isn't spewed to the console
when searching for GTK2 libs, and they aren't found.

........

................

Modified:
    team/group/res_config_ldap/   (props changed)
    team/group/res_config_ldap/configure
    team/group/res_config_ldap/configure.ac

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Jun 30 11:55:38 2007
@@ -1,1 +1,1 @@
-/trunk:1-72744
+/trunk:1-72769

Modified: team/group/res_config_ldap/configure
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/configure?view=diff&rev=72770&r1=72769&r2=72770
==============================================================================
--- team/group/res_config_ldap/configure (original)
+++ team/group/res_config_ldap/configure Sat Jun 30 11:55:38 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 72704 .
+# From configure.ac Revision: 72740 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -36068,7 +36068,7 @@
 fi
 
 if test ! "x${PKGCONFIG}" = xNo; then
-   GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags)
+   GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null)
    GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs)
    PBX_GTK2=1
 

Modified: team/group/res_config_ldap/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/configure.ac?view=diff&rev=72770&r1=72769&r2=72770
==============================================================================
--- team/group/res_config_ldap/configure.ac (original)
+++ team/group/res_config_ldap/configure.ac Sat Jun 30 11:55:38 2007
@@ -1036,7 +1036,7 @@
 PBX_GTK2=0
 AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
 if test ! "x${PKGCONFIG}" = xNo; then
-   GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags)
+   GTK2_INCLUDE=$(${PKGCONFIG} gtk+-2.0 --cflags 2>/dev/null)
    GTK2_LIB=$(${PKGCONFIG} gtk+-2.0 --libs)
    PBX_GTK2=1
    AC_DEFINE([HAVE_GTK2], 1, [Define if your system has the GTK2 libraries.])