[asterisk-commits] mattf: branch mattf/asterisk-ss7 r43401 - /team/mattf/asterisk-ss7/configure

[asterisk-commits at lists.digium.com]

Author: mattf
Date: Thu Sep 21 10:56:30 2006
New Revision: 43401

URL: http://svn.digium.com/view/asterisk?rev=43401&view=rev
Log:
Fix0r it

Modified:
    team/mattf/asterisk-ss7/configure

Modified: team/mattf/asterisk-ss7/configure
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/configure?rev=43401&r1=43400&r2=43401&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/configure (original)
+++ team/mattf/asterisk-ss7/configure Thu Sep 21 10:56:30 2006
@@ -1,9 +1,5 @@
 #! /bin/sh
-<<<<<<< .working
-# From configure.ac Revision: 43274 .
-=======
-# From configure.ac Revision: 43281 .
->>>>>>> .merge-right.r43397
+# From configure.ac Revision: 43400 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60a.
 #
@@ -24054,7 +24050,6 @@
 fi
 
 
-<<<<<<< .working
 
 if test "${USE_SS7}" != "no"; then
    pbxlibdir=""
@@ -24516,8 +24511,6 @@
 
 
 PLATFORM_PTLIB="ptlib_${OSTYPE}_${MACHTYPE}_r"
-=======
->>>>>>> .merge-right.r43397
 if test "${USE_PWLIB}" != "no"; then
 	if test ! -z "${PWLIB_DIR}"; then
 		PWLIBDIR="${PWLIB_DIR}"
@@ -31899,9 +31892,6 @@
 ZLIB_LIB!$ZLIB_LIB$ac_delim
 ZLIB_INCLUDE!$ZLIB_INCLUDE$ac_delim
 PBX_ZLIB!$PBX_ZLIB$ac_delim
-ZAPTEL_LIB!$ZAPTEL_LIB$ac_delim
-ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim
-PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -31943,6 +31933,9 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+ZAPTEL_LIB!$ZAPTEL_LIB$ac_delim
+ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim
+PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
 ALLOCA!$ALLOCA$ac_delim
 EGREP!$EGREP$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
@@ -31979,11 +31972,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-<<<<<<< .working
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
-=======
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then
->>>>>>> .merge-right.r43397
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 37; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5