[svn-commits] russell: branch group/res_config_ldap r64239 - /team/group/res_config_ldap/

[svn-commits at lists.digium.com]

Author: russell
Date: Mon May 14 12:23:44 2007
New Revision: 64239

URL: http://svn.digium.com/view/asterisk?view=rev&rev=64239
Log:
Merged revisions 64225-64226 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r64225 | russell | 2007-05-14 11:08:19 -0500 (Mon, 14 May 2007) | 3 lines

Remove an extra space from the macro that checks for C defines.
(issue #9715, tzafrir)

........
r64226 | russell | 2007-05-14 11:08:48 -0500 (Mon, 14 May 2007) | 2 lines

Regenerate configure script after last change to acinclude.m4

........

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

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/res_config_ldap/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon May 14 12:23:44 2007
@@ -1,1 +1,1 @@
-/trunk:1-64210
+/trunk:1-64238

Modified: team/group/res_config_ldap/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/acinclude.m4?view=diff&rev=64239&r1=64238&r2=64239
==============================================================================
--- team/group/res_config_ldap/acinclude.m4 (original)
+++ team/group/res_config_ldap/acinclude.m4 Mon May 14 12:23:44 2007
@@ -77,7 +77,7 @@
 	AC_MSG_CHECKING([for $2 in $3])
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${$1_DIR}" != "x"; then
-	    $1_INCLUDE= "-I${$1_DIR}/include"
+	    $1_INCLUDE="-I${$1_DIR}/include"
 	fi
 	CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
 

Modified: team/group/res_config_ldap/configure
URL: http://svn.digium.com/view/asterisk/team/group/res_config_ldap/configure?view=diff&rev=64239&r1=64238&r2=64239
==============================================================================
--- team/group/res_config_ldap/configure (original)
+++ team/group/res_config_ldap/configure Mon May 14 12:23:44 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 60640 .
+# From configure.ac Revision: 63331 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -15058,7 +15058,7 @@
 echo $ECHO_N "checking for PTHREAD_RWLOCK_INITIALIZER in pthread.h... $ECHO_C" >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${PTHREAD_RWLOCK_INITIALIZER_DIR}" != "x"; then
-	    PTHREAD_RWLOCK_INITIALIZER_INCLUDE= "-I${PTHREAD_RWLOCK_INITIALIZER_DIR}/include"
+	    PTHREAD_RWLOCK_INITIALIZER_INCLUDE="-I${PTHREAD_RWLOCK_INITIALIZER_DIR}/include"
 	fi
 	CPPFLAGS="${CPPFLAGS} ${PTHREAD_RWLOCK_INITIALIZER_INCLUDE}"
 
@@ -15127,7 +15127,7 @@
 echo $ECHO_N "checking for PTHREAD_RWLOCK_PREFER_WRITER_NP in pthread.h... $ECHO_C" >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${PTHREAD_RWLOCK_PREFER_WRITER_NP_DIR}" != "x"; then
-	    PTHREAD_RWLOCK_PREFER_WRITER_NP_INCLUDE= "-I${PTHREAD_RWLOCK_PREFER_WRITER_NP_DIR}/include"
+	    PTHREAD_RWLOCK_PREFER_WRITER_NP_INCLUDE="-I${PTHREAD_RWLOCK_PREFER_WRITER_NP_DIR}/include"
 	fi
 	CPPFLAGS="${CPPFLAGS} ${PTHREAD_RWLOCK_PREFER_WRITER_NP_INCLUDE}"
 
@@ -15725,7 +15725,7 @@
 echo $ECHO_N "checking for RTLD_NOLOAD in dlfcn.h... $ECHO_C" >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${RTLD_NOLOAD_DIR}" != "x"; then
-	    RTLD_NOLOAD_INCLUDE= "-I${RTLD_NOLOAD_DIR}/include"
+	    RTLD_NOLOAD_INCLUDE="-I${RTLD_NOLOAD_DIR}/include"
 	fi
 	CPPFLAGS="${CPPFLAGS} ${RTLD_NOLOAD_INCLUDE}"
 
@@ -15795,7 +15795,7 @@
 echo $ECHO_N "checking for IP_MTU_DISCOVER in netinet/in.h... $ECHO_C" >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${IP_MTU_DISCOVER_DIR}" != "x"; then
-	    IP_MTU_DISCOVER_INCLUDE= "-I${IP_MTU_DISCOVER_DIR}/include"
+	    IP_MTU_DISCOVER_INCLUDE="-I${IP_MTU_DISCOVER_DIR}/include"
 	fi
 	CPPFLAGS="${CPPFLAGS} ${IP_MTU_DISCOVER_INCLUDE}"
 
@@ -32894,7 +32894,7 @@
 echo $ECHO_N "checking for ZT_TONE_DTMF_BASE in zaptel/zaptel.h... $ECHO_C" >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${ZAPTEL_DIR}" != "x"; then
-	    ZAPTEL_INCLUDE= "-I${ZAPTEL_DIR}/include"
+	    ZAPTEL_INCLUDE="-I${ZAPTEL_DIR}/include"
 	fi
 	CPPFLAGS="${CPPFLAGS} ${ZAPTEL_INCLUDE}"
 
@@ -32963,7 +32963,7 @@
 echo $ECHO_N "checking for ZT_DIAL_OP_CANCEL in zaptel/zaptel.h... $ECHO_C" >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${ZAPTEL_DIR}" != "x"; then
-	    ZAPTEL_INCLUDE= "-I${ZAPTEL_DIR}/include"
+	    ZAPTEL_INCLUDE="-I${ZAPTEL_DIR}/include"
 	fi
 	CPPFLAGS="${CPPFLAGS} ${ZAPTEL_INCLUDE}"
 
@@ -33034,7 +33034,7 @@
 echo $ECHO_N "checking for ZT_EVENT_REMOVED in zaptel/zaptel.h... $ECHO_C" >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${ZAPTEL_VLDTMF_DIR}" != "x"; then
-	    ZAPTEL_VLDTMF_INCLUDE= "-I${ZAPTEL_VLDTMF_DIR}/include"
+	    ZAPTEL_VLDTMF_INCLUDE="-I${ZAPTEL_VLDTMF_DIR}/include"
 	fi
 	CPPFLAGS="${CPPFLAGS} ${ZAPTEL_VLDTMF_INCLUDE}"
 
@@ -33105,7 +33105,7 @@
 echo $ECHO_N "checking for ZT_TCOP_ALLOCATE in zaptel/zaptel.h... $ECHO_C" >&6; }
 	saved_cppflags="${CPPFLAGS}"
 	if test "x${ZAPTEL_TRANSCODE_DIR}" != "x"; then
-	    ZAPTEL_TRANSCODE_INCLUDE= "-I${ZAPTEL_TRANSCODE_DIR}/include"
+	    ZAPTEL_TRANSCODE_INCLUDE="-I${ZAPTEL_TRANSCODE_DIR}/include"
 	fi
 	CPPFLAGS="${CPPFLAGS} ${ZAPTEL_TRANSCODE_INCLUDE}"