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

[asterisk-commits at lists.digium.com]

Author: mattf
Date: Mon Sep 18 16:57:55 2006
New Revision: 43234

URL: http://svn.digium.com/view/asterisk?rev=43234&view=rev
Log:
Update configure script again

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=43234&r1=43233&r2=43234&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/configure (original)
+++ team/mattf/asterisk-ss7/configure Mon Sep 18 16:57:55 2006
@@ -1,9 +1,5 @@
 #! /bin/sh
-<<<<<<< .working
-# From configure.ac Revision: 41594 .
-=======
-# From configure.ac Revision: 42982 .
->>>>>>> .merge-right.r43230
+# From configure.ac Revision: 43233 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60a.
 #
@@ -31033,12 +31029,6 @@
 ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim
 PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
 ALLOCA!$ALLOCA$ac_delim
-EGREP!$EGREP$ac_delim
-<<<<<<< .working
-=======
-LIBOBJS!$LIBOBJS$ac_delim
-POW_LIB!$POW_LIB$ac_delim
->>>>>>> .merge-right.r43230
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -31080,13 +31070,10 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-<<<<<<< .working
+EGREP!$EGREP$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 POW_LIB!$POW_LIB$ac_delim
 GC_CFLAGS!$GC_CFLAGS$ac_delim
-=======
-GC_CFLAGS!$GC_CFLAGS$ac_delim
->>>>>>> .merge-right.r43230
 GC_LDFLAGS!$GC_LDFLAGS$ac_delim
 GSM_INTERNAL!$GSM_INTERNAL$ac_delim
 KDEINIT!$KDEINIT$ac_delim
@@ -31108,11 +31095,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-<<<<<<< .working
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then
-=======
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
->>>>>>> .merge-right.r43230
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5