[asterisk-commits] oej: branch oej/dialplan-ami-amievents r46435 - in /team/oej/dialplan-ami-ami...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Mon Oct 30 09:47:22 MST 2006


Author: oej
Date: Mon Oct 30 10:47:20 2006
New Revision: 46435

URL: http://svn.digium.com/view/asterisk?rev=46435&view=rev
Log:
Reset automerge

Added:
    team/oej/dialplan-ami-amievents/build_tools/embed_modules.xml
      - copied unchanged from r46432, trunk/build_tools/embed_modules.xml
    team/oej/dialplan-ami-amievents/build_tools/prep_tarball
      - copied unchanged from r46432, trunk/build_tools/prep_tarball
    team/oej/dialplan-ami-amievents/build_tools/strip_nonapi
      - copied unchanged from r46432, trunk/build_tools/strip_nonapi
    team/oej/dialplan-ami-amievents/channels/h323/Makefile.in
      - copied unchanged from r46432, trunk/channels/h323/Makefile.in
    team/oej/dialplan-ami-amievents/channels/h323/caps_h323.cxx
      - copied unchanged from r46432, trunk/channels/h323/caps_h323.cxx
    team/oej/dialplan-ami-amievents/channels/h323/cisco-h225.cxx
      - copied unchanged from r46432, trunk/channels/h323/cisco-h225.cxx
    team/oej/dialplan-ami-amievents/channels/h323/compat_h323.cxx
      - copied unchanged from r46432, trunk/channels/h323/compat_h323.cxx
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-ntest10/
      - copied from r46432, trunk/pbx/ael/ael-test/ael-ntest10/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-ntest10/extensions.ael
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-ntest10/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-ntest12/
      - copied from r46432, trunk/pbx/ael/ael-test/ael-ntest12/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-ntest12/extensions.ael
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-ntest12/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-ntest9/
      - copied from r46432, trunk/pbx/ael/ael-test/ael-ntest9/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-ntest9/extensions.ael
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-ntest9/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test11/
      - copied from r46432, trunk/pbx/ael/ael-test/ael-test11/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test11/extensions.ael
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-test11/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test14/
      - copied from r46432, trunk/pbx/ael/ael-test/ael-test14/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test14/extensions.ael
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-test14/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test15/
      - copied from r46432, trunk/pbx/ael/ael-test/ael-test15/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test15/extensions.ael
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-test15/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test16/
      - copied from r46432, trunk/pbx/ael/ael-test/ael-test16/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test16/extensions.ael
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-test16/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-vtest13/
      - copied from r46432, trunk/pbx/ael/ael-test/ael-vtest13/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-vtest13/extensions.ael
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-vtest13/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-vtest13/include1.ael2
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-vtest13/include1.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-vtest13/include2.ael2
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-vtest13/include2.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-vtest13/include3.ael2
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-vtest13/include3.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-vtest13/include4.ael2
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-vtest13/include4.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-vtest13/include5.ael2
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-vtest13/include5.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-vtest17/
      - copied from r46432, trunk/pbx/ael/ael-test/ael-vtest17/
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-vtest17/extensions.ael
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ael-vtest17/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-ntest10
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ref.ael-ntest10
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-ntest12
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ref.ael-ntest12
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-ntest9
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ref.ael-ntest9
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test11
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ref.ael-test11
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test14
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ref.ael-test14
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test15
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ref.ael-test15
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test16
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ref.ael-test16
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-vtest13
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ref.ael-vtest13
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-vtest17
      - copied unchanged from r46432, trunk/pbx/ael/ael-test/ref.ael-vtest17
    team/oej/dialplan-ami-amievents/pbx/kdeconsole_main.cc
      - copied unchanged from r46432, trunk/pbx/kdeconsole_main.cc
Removed:
    team/oej/dialplan-ami-amievents/abstract_jb.c
    team/oej/dialplan-ami-amievents/acl.c
    team/oej/dialplan-ami-amievents/aescrypt.c
    team/oej/dialplan-ami-amievents/aeskey.c
    team/oej/dialplan-ami-amievents/aesopt.h
    team/oej/dialplan-ami-amievents/aestab.c
    team/oej/dialplan-ami-amievents/alaw.c
    team/oej/dialplan-ami-amievents/app.c
    team/oej/dialplan-ami-amievents/ast_expr2.c
    team/oej/dialplan-ami-amievents/ast_expr2.fl
    team/oej/dialplan-ami-amievents/ast_expr2.h
    team/oej/dialplan-ami-amievents/ast_expr2.y
    team/oej/dialplan-ami-amievents/ast_expr2f.c
    team/oej/dialplan-ami-amievents/asterisk.8
    team/oej/dialplan-ami-amievents/asterisk.c
    team/oej/dialplan-ami-amievents/asterisk.sgml
    team/oej/dialplan-ami-amievents/astmm.c
    team/oej/dialplan-ami-amievents/autoservice.c
    team/oej/dialplan-ami-amievents/buildinfo.c
    team/oej/dialplan-ami-amievents/callerid.c
    team/oej/dialplan-ami-amievents/cdr.c
    team/oej/dialplan-ami-amievents/channel.c
    team/oej/dialplan-ami-amievents/channels/chan_vpb.c
    team/oej/dialplan-ami-amievents/channels/h323/Makefile
    team/oej/dialplan-ami-amievents/channels/h323/ast_h323.cpp
    team/oej/dialplan-ami-amievents/channels/h323/h323.conf.sample
    team/oej/dialplan-ami-amievents/chanvars.c
    team/oej/dialplan-ami-amievents/cli.c
    team/oej/dialplan-ami-amievents/coef_in.h
    team/oej/dialplan-ami-amievents/coef_out.h
    team/oej/dialplan-ami-amievents/config.c
    team/oej/dialplan-ami-amievents/cryptostub.c
    team/oej/dialplan-ami-amievents/cygwin/
    team/oej/dialplan-ami-amievents/db.c
    team/oej/dialplan-ami-amievents/db1-ast/
    team/oej/dialplan-ami-amievents/devicestate.c
    team/oej/dialplan-ami-amievents/dlfcn.c
    team/oej/dialplan-ami-amievents/dns.c
    team/oej/dialplan-ami-amievents/dnsmgr.c
    team/oej/dialplan-ami-amievents/dsp.c
    team/oej/dialplan-ami-amievents/ecdisa.h
    team/oej/dialplan-ami-amievents/editline/
    team/oej/dialplan-ami-amievents/enum.c
    team/oej/dialplan-ami-amievents/file.c
    team/oej/dialplan-ami-amievents/fixedjitterbuf.c
    team/oej/dialplan-ami-amievents/fixedjitterbuf.h
    team/oej/dialplan-ami-amievents/frame.c
    team/oej/dialplan-ami-amievents/fskmodem.c
    team/oej/dialplan-ami-amievents/http.c
    team/oej/dialplan-ami-amievents/image.c
    team/oej/dialplan-ami-amievents/indications.c
    team/oej/dialplan-ami-amievents/io.c
    team/oej/dialplan-ami-amievents/jitterbuf.c
    team/oej/dialplan-ami-amievents/jitterbuf.h
    team/oej/dialplan-ami-amievents/loader.c
    team/oej/dialplan-ami-amievents/logger.c
    team/oej/dialplan-ami-amievents/manager.c
    team/oej/dialplan-ami-amievents/md5.c
    team/oej/dialplan-ami-amievents/muted.c
    team/oej/dialplan-ami-amievents/netsock.c
    team/oej/dialplan-ami-amievents/pbx.c
    team/oej/dialplan-ami-amievents/pbx/pbx_kdeconsole_main.cc
    team/oej/dialplan-ami-amievents/plc.c
    team/oej/dialplan-ami-amievents/poll.c
    team/oej/dialplan-ami-amievents/privacy.c
    team/oej/dialplan-ami-amievents/rtp.c
    team/oej/dialplan-ami-amievents/say.c
    team/oej/dialplan-ami-amievents/sched.c
    team/oej/dialplan-ami-amievents/sha1.c
    team/oej/dialplan-ami-amievents/slinfactory.c
    team/oej/dialplan-ami-amievents/sounds.txt
    team/oej/dialplan-ami-amievents/srv.c
    team/oej/dialplan-ami-amievents/stdtime/
    team/oej/dialplan-ami-amievents/strcompat.c
    team/oej/dialplan-ami-amievents/tdd.c
    team/oej/dialplan-ami-amievents/term.c
    team/oej/dialplan-ami-amievents/translate.c
    team/oej/dialplan-ami-amievents/udptl.c
    team/oej/dialplan-ami-amievents/ulaw.c
    team/oej/dialplan-ami-amievents/utils.c
Modified:
    team/oej/dialplan-ami-amievents/   (props changed)
    team/oej/dialplan-ami-amievents/bootstrap.sh
    team/oej/dialplan-ami-amievents/build_tools/cflags.xml
    team/oej/dialplan-ami-amievents/build_tools/make_buildopts_h
    team/oej/dialplan-ami-amievents/build_tools/make_version
    team/oej/dialplan-ami-amievents/build_tools/menuselect-deps.in
    team/oej/dialplan-ami-amievents/build_tools/mkpkgconfig
    team/oej/dialplan-ami-amievents/build_tools/prep_moduledeps
    team/oej/dialplan-ami-amievents/configure
    team/oej/dialplan-ami-amievents/pbx/   (props changed)
    team/oej/dialplan-ami-amievents/pbx/Makefile
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test1/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test3/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ael-test5/extensions.ael
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test1
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test2
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test3
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test4
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test5
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test6
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test7
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/ref.ael-test8
    team/oej/dialplan-ami-amievents/pbx/ael/ael-test/runtests
    team/oej/dialplan-ami-amievents/pbx/ael/ael.flex
    team/oej/dialplan-ami-amievents/pbx/ael/ael.tab.c
    team/oej/dialplan-ami-amievents/pbx/ael/ael.tab.h
    team/oej/dialplan-ami-amievents/pbx/ael/ael.y
    team/oej/dialplan-ami-amievents/pbx/ael/ael_lex.c
    team/oej/dialplan-ami-amievents/pbx/dundi-parser.c
    team/oej/dialplan-ami-amievents/pbx/pbx_ael.c
    team/oej/dialplan-ami-amievents/pbx/pbx_config.c
    team/oej/dialplan-ami-amievents/pbx/pbx_dundi.c
    team/oej/dialplan-ami-amievents/pbx/pbx_gtkconsole.c
    team/oej/dialplan-ami-amievents/pbx/pbx_kdeconsole.cc
    team/oej/dialplan-ami-amievents/pbx/pbx_loopback.c
    team/oej/dialplan-ami-amievents/pbx/pbx_realtime.c
    team/oej/dialplan-ami-amievents/pbx/pbx_spool.c

Propchange: team/oej/dialplan-ami-amievents/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Modified: team/oej/dialplan-ami-amievents/bootstrap.sh
URL: http://svn.digium.com/view/asterisk/team/oej/dialplan-ami-amievents/bootstrap.sh?rev=46435&r1=46434&r2=46435&view=diff
==============================================================================
--- team/oej/dialplan-ami-amievents/bootstrap.sh (original)
+++ team/oej/dialplan-ami-amievents/bootstrap.sh Mon Oct 30 10:47:20 2006
@@ -9,33 +9,32 @@
 	fi
 }
 
+# On FreeBSD, multiple autoconf/automake versions have different names.
+# On linux, envitonment variables tell which one to use.
+
 uname -s | grep -q FreeBSD
-if [ $? = 0 ]
-then
-	check_for_app autoconf259
-	check_for_app autoheader259
-	check_for_app automake19
-	check_for_app aclocal19
-	echo "Generating the configure script ..."
-	aclocal19 2>/dev/null
-	autoconf259
-	autoheader259
-	automake19 --add-missing --copy 2>/dev/null
-else
-	AUTOCONF_VERSION=2.59
+if [ $? = 0 ] ; then	# FreeBSD case
+	MY_AC_VER=259
+	MY_AM_VER=19
+else	# linux case
+	MY_AC_VER=
+	MY_AM_VER=
+	AUTOCONF_VERSION=2.60
 	AUTOMAKE_VERSION=1.9
 	export AUTOCONF_VERSION
 	export AUTOMAKE_VERSION
-
-	check_for_app autoconf
-	check_for_app autoheader
-	check_for_app automake
-	check_for_app aclocal
-	echo "Generating the configure script ..."
-	aclocal 2>/dev/null
-	autoconf
-	autoheader
-	automake --add-missing --copy 2>/dev/null
 fi
 
+check_for_app autoconf${MY_AC_VER}
+check_for_app autoheader${MY_AC_VER}
+check_for_app automake${MY_AM_VER}
+check_for_app aclocal${MY_AM_VER}
+
+echo "Generating the configure script ..."
+
+aclocal${MY_AM_VER} 2>/dev/null
+autoconf${MY_AC_VER}
+autoheader${MY_AC_VER}
+automake${MY_AM_VER} --add-missing --copy 2>/dev/null
+
 exit 0

Modified: team/oej/dialplan-ami-amievents/build_tools/cflags.xml
URL: http://svn.digium.com/view/asterisk/team/oej/dialplan-ami-amievents/build_tools/cflags.xml?rev=46435&r1=46434&r2=46435&view=diff
==============================================================================
--- team/oej/dialplan-ami-amievents/build_tools/cflags.xml (original)
+++ team/oej/dialplan-ami-amievents/build_tools/cflags.xml Mon Oct 30 10:47:20 2006
@@ -7,7 +7,9 @@
 		</member>
 		<member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
 		</member>
-		<member name="DONT_OPTIMIZE" displayname="Disable Optimizations from the Compiler">
+		<member name="DO_CRASH" displayname="Crash on fatal errors">
+		</member>
+		<member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
 		</member>
 		<member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
 		</member>
@@ -21,4 +23,9 @@
 		</member>
 		<member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
 		</member>
+		<member name="STATIC_BUILD" displayname="Build static binaries">
+		</member>
+		<member name="LOADABLE_MODULES" displayname="Runtime module loading">
+			<defaultenabled>yes</defaultenabled>
+		</member>
 	</category>

Modified: team/oej/dialplan-ami-amievents/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/team/oej/dialplan-ami-amievents/build_tools/make_buildopts_h?rev=46435&r1=46434&r2=46435&view=diff
==============================================================================
--- team/oej/dialplan-ami-amievents/build_tools/make_buildopts_h (original)
+++ team/oej/dialplan-ami-amievents/build_tools/make_buildopts_h Mon Oct 30 10:47:20 2006
@@ -7,7 +7,7 @@
  */
 
 END
-TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed s/MENUSELECT_CFLAGS\=//g | sed s/-D//g`
+TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
 for x in ${TMP}; do
      echo "#define ${x} 1"
 done

Modified: team/oej/dialplan-ami-amievents/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/team/oej/dialplan-ami-amievents/build_tools/make_version?rev=46435&r1=46434&r2=46435&view=diff
==============================================================================
--- team/oej/dialplan-ami-amievents/build_tools/make_version (original)
+++ team/oej/dialplan-ami-amievents/build_tools/make_version Mon Oct 30 10:47:20 2006
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 if [ -f ${1}/.version ]; then
-	cat ${1}.version
+	cat ${1}/.version
 elif [ -f ${1}/.svnrevision ]; then
 	echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
 elif [ -d .svn ]; then
-    PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :g'`
+    PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
     BRANCH=0
     TEAM=0
     

Modified: team/oej/dialplan-ami-amievents/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/oej/dialplan-ami-amievents/build_tools/menuselect-deps.in?rev=46435&r1=46434&r2=46435&view=diff
==============================================================================
--- team/oej/dialplan-ami-amievents/build_tools/menuselect-deps.in (original)
+++ team/oej/dialplan-ami-amievents/build_tools/menuselect-deps.in Mon Oct 30 10:47:20 2006
@@ -1,31 +1,36 @@
 ASOUND=@PBX_ALSA@
 CURL=@PBX_CURL@
 FREETDS=@PBX_FREETDS@
+GSM=@PBX_GSM@
 GTK=@PBX_GTK@
 H323=@PBX_H323@
+OPENH323=@PBX_OPENH323@
+IKSEMEL=@PBX_IKSEMEL@
+IMAP_TK=@PBX_IMAP_TK@
+IXJUSER=@PBX_IXJUSER@
 KDE=@PBX_KDE@
+NBS=@PBX_NBS@
+NETSNMP=@PBX_NETSNMP@
 NEWT=@PBX_NEWT@
+OGG=@PBX_OGG@
 OSPTK=@PBX_OSPTK@
+OSSAUDIO=@PBX_OSS@
+PGSQL=@PBX_PGSQL@
 POPT=@PBX_POPT@
 PRI=@PBX_PRI@
-SPEEX=@PBX_SPEEX@
-VORBIS=@PBX_VORBIS@
-NBS=@PBX_NBS@
-OGG=@PBX_OGG@
-OSSAUDIO=@PBX_OSS@
-PGSQL=@PBX_PGSQL@
+SS7=@PBX_SS7@
 QT=@PBX_QT@
 RADIUS=@PBX_RADIUS@
+SPEEX=@PBX_SPEEX@
 SQLITE=@PBX_SQLITE@
 SSL=@PBX_OPENSSL@
+TONEZONE=@PBX_TONEZONE@
 UNIXODBC=@PBX_UNIXODBC@
+VORBIS=@PBX_VORBIS@
 VPBAPI=@PBX_VPB@
 WIN32=@OSISWIN32@
+ZAPTEL=@PBX_ZAPTEL@
 ZLIB=@PBX_ZLIB@
-TONEZONE=@PBX_TONEZONE@
-ZAPTEL=@PBX_ZAPTEL@
-GSM=@PBX_GSM@
-IKSEMEL=@PBX_IKSEMEL@
-IXJUSER=@PBX_IXJUSER@
-NETSNMP=@PBX_NETSNMP@
-IMAP_TK=@PBX_IMAP_TK@
+ISDNNET=@PBX_ISDNNET@
+MISDN=@PBX_MISDN@
+SUPPSERV=@PBX_SUPPSERV@

Modified: team/oej/dialplan-ami-amievents/build_tools/mkpkgconfig
URL: http://svn.digium.com/view/asterisk/team/oej/dialplan-ami-amievents/build_tools/mkpkgconfig?rev=46435&r1=46434&r2=46435&view=diff
==============================================================================
--- team/oej/dialplan-ami-amievents/build_tools/mkpkgconfig (original)
+++ team/oej/dialplan-ami-amievents/build_tools/mkpkgconfig Mon Oct 30 10:47:20 2006
@@ -13,13 +13,20 @@
   exit
 fi
 
+#Solaris (and some others) don't have sed -r.  perl -p is equivalent
+if [[ `echo "xxx" | sed -r 's/x/y/g' 2>/dev/null | grep -c "yyy"` != 0 ]]; then
+    EXTREGEX="sed -r -e"
+else
+    EXTREGEX="perl -pe"
+fi
+
 ## Clean out CFLAGS for the spec file.
 
-LOCAL_CFLAGS=`echo $CFLAGS | sed -e 's/\s*-pipe\s*//g' | sed -e 's/-[Wmp]\S*\s*//g' | \
-  sed -r -e 's/-I(include|\.\.\/include) //g' | \
-  sed -e 's/-DINSTALL_PREFIX=\S* //g' | \
-  sed -r -e 's/-DASTERISK_VERSION=\S* //g' | \
-  sed -r -e 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
+LOCAL_CFLAGS=`echo $CFLAGS | ${EXTREGEX} 's/\s*-pipe\s*//g' | ${EXTREGEX} 's/-[Wmp]\S*\s*//g' | \
+  ${EXTREGEX} 's/-I(include|\.\.\/include) //g' | \
+  ${EXTREGEX} 's/-DINSTALL_PREFIX=\S* //g' | \
+  ${EXTREGEX} 's/-DASTERISK_VERSION=\S* //g' | \
+  ${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
 
 
 cat <<EOF > $PPATH/asterisk.pc

Modified: team/oej/dialplan-ami-amievents/build_tools/prep_moduledeps
URL: http://svn.digium.com/view/asterisk/team/oej/dialplan-ami-amievents/build_tools/prep_moduledeps?rev=46435&r1=46434&r2=46435&view=diff
==============================================================================
--- team/oej/dialplan-ami-amievents/build_tools/prep_moduledeps (original)
+++ team/oej/dialplan-ami-amievents/build_tools/prep_moduledeps Mon Oct 30 10:47:20 2006
@@ -1,29 +1,7 @@
 #!/bin/sh
 
 get_description() {
-	x=${1}
-	TDESC=`cat $x | grep -e *tdesc | cut -f 2 -d '"'`
-	if [ "$TDESC" = "" ]; then
-		TDESC=`cat $x | grep -A 2 -e *description | grep -e '\"'  | cut -f 2 -d '"'` 
-	fi
-	if [ "$TDESC" = "" ]; then
-		TDESC=`cat $x | grep -e MODULE_DESCRIPTION | grep -v return | cut -f 2 -d '"'`
-	fi
-	if [ "$TDESC" = "" ]; then
-		TDESC=`cat $x | grep -e tdesc\\\[\\\] | cut -f 2 -d '"'`
-	fi
-	if [ "$TDESC" = "" ]; then
-		TDESC=`cat $x | grep -e desc\\\[\\\] | grep -v description | cut -f 2 -d '"'`
-	fi
-	if [ "$TDESC" = "" ]; then
-		TDESC=`cat $x | grep -e *desc | grep -v descrip | cut -f 2 -d '"'`
-	fi
-	if [ "$TDESC" = "" ]; then
-		TDESC=`cat $x | grep -e *dtext | grep static | cut -f 2 -d '"'`
-	fi
-	if [ "$TDESC" = "" ]; then
-		TDESC=`cat $x | grep -A 2 -e *synopsis | grep -e '\"'  | cut -f 2 -d '"'` 
-	fi
+	TDESC=`grep -e AST_MODULE_INFO ${1} | cut -d '"' -f 2`
 }
 
 process_dir() {
@@ -32,25 +10,25 @@
 	catsuffix=${3}
 	displayname=${4}
 
-	echo -e "\t<category name=\"MENUSELECT_${catsuffix}\" displayname=\"${displayname}\">"
-	for file in ${dir}/${prefix}*.c
+	echo -e "\t<category name=\"MENUSELECT_${catsuffix}\" displayname=\"${displayname}\" remove_on_change=\"${dir}/modules.link\">"
+	for file in `ls ${dir}/${prefix}*.c ${dir}/${prefix}*.cc 2> /dev/null | sort`
 	do
+		if [ ! -f ${file} ]; then
+			continue
+		fi
 		fname=`basename ${file} .c`
+		fname=`basename ${fname} .cc`
 		get_description ${file}
 		desc=${TDESC}
-		echo -e "\t\t<member name=\"${fname}\" displayname=\"${desc}\" remove_on_change=\"${dir}/${fname}.o ${dir}/${fname}.so\">"
+		echo -e "\t\t<member name=\"${fname}\" displayname=\"${desc}\" remove_on_change=\"${dir}/${fname}.o ${dir}/${fname}.oo ${dir}/${fname}.so\">"
 		awk -f build_tools/get_moduleinfo ${file}
 		echo -e "\t\t</member>"
+		awk -f build_tools/get_makeopts ${file} >> .makeoptstmp
 	done
 	echo -e "\t</category>"
-
-	for file in ${dir}/${prefix}*.c
-	do
-		awk -f build_tools/get_makeopts ${file} >> .makeoptstmp
-	done
 }
 
-echo "<?xml version="1.0"?>"
+echo "<?xml version=\"1.0\"?>"
 echo
 echo "<menu name=\"Asterisk Module Selection\">"
 rm -f .makeoptstmp
@@ -62,8 +40,9 @@
 process_dir funcs func FUNCS "Dialplan Functions"
 process_dir pbx pbx PBX "PBX Modules"
 process_dir res res RES "Resource Modules"
+cat .makeoptstmp
 cat build_tools/cflags.xml
+cat build_tools/embed_modules.xml
 cat sounds/sounds.xml
-cat .makeoptstmp
 rm -f .makeoptstmp
 echo "</menu>"

Modified: team/oej/dialplan-ami-amievents/configure
URL: http://svn.digium.com/view/asterisk/team/oej/dialplan-ami-amievents/configure?rev=46435&r1=46434&r2=46435&view=diff
==============================================================================
--- team/oej/dialplan-ami-amievents/configure (original)
+++ team/oej/dialplan-ami-amievents/configure Mon Oct 30 10:47:20 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 37086 .
+# From configure.ac Revision: 45892 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59e.
+# Generated by GNU Autoconf 2.60a.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -233,8 +233,8 @@
 
 
       for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells which exist, to save several forks.
-	 if test -f "$as_shell" &&
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -565,40 +565,40 @@
 PACKAGE_BUGREPORT=
 
 ac_unique_file="asterisk"
-ac_unique_file="asterisk.c"
+ac_unique_file="main/asterisk.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
@@ -647,25 +647,22 @@
 host_cpu
 host_vendor
 host_os
-target
-target_cpu
-target_vendor
-target_os
-PBX_PLATFORM
-PBX_CPU
-PBX_VENDOR
-PBX_OS
+BUILD_PLATFORM
+BUILD_CPU
+BUILD_VENDOR
+BUILD_OS
+HOST_PLATFORM
+HOST_CPU
+HOST_VENDOR
+HOST_OS
+OSARCH
 UNAME
 PBX_OSREV
-OSISWIN32
-PBX_OSTYPE
 CC
 CXX
+LD
 RANLIB
 AR
-NM
-WINDRES
-DLLWRAP
 CFLAGS
 LDFLAGS
 CPPFLAGS
@@ -686,6 +683,7 @@
 FIND
 COMPRESS
 BASENAME
+ID
 DIRNAME
 LN
 DOT
@@ -693,9 +691,18 @@
 ALSA_LIB
 ALSA_INCLUDE
 PBX_ALSA
+CAP_LIB
+CAP_INCLUDE
+PBX_CAP
+CURL_LIB
+CURL_INCLUDE
+PBX_CURL
 CURSES_LIB
 CURSES_INCLUDE
 PBX_CURSES
+GNUTLS_LIB
+GNUTLS_INCLUDE
+PBX_GNUTLS
 GSM_LIB
 GSM_INCLUDE
 PBX_GSM
@@ -705,9 +712,15 @@
 IMAP_TK_LIB
 IMAP_TK_INCLUDE
 PBX_IMAP_TK
+ISDNNET_LIB
+ISDNNET_INCLUDE
+PBX_ISDNNET
 KDE_LIB
 KDE_INCLUDE
 PBX_KDE
+MISDN_LIB
+MISDN_INCLUDE
+PBX_MISDN
 NBS_LIB
 NBS_INCLUDE
 PBX_NBS
@@ -741,9 +754,15 @@
 PRI_LIB
 PRI_INCLUDE
 PBX_PRI
+SS7_LIB
+SS7_INCLUDE
+PBX_SS7
 PWLIB_LIB
 PWLIB_INCLUDE
 PBX_PWLIB
+OPENH323_LIB
+OPENH323_INCLUDE
+PBX_OPENH323
 QT_LIB
 QT_INCLUDE
 PBX_QT
@@ -756,6 +775,9 @@
 SQLITE_LIB
 SQLITE_INCLUDE
 PBX_SQLITE
+SUPPSERV_LIB
+SUPPSERV_INCLUDE
+PBX_SUPPSERV
 OPENSSL_LIB
 OPENSSL_INCLUDE
 PBX_OPENSSL
@@ -787,10 +809,23 @@
 EGREP
 LIBOBJS
 POW_LIB
+GC_CFLAGS
+GC_LDFLAGS
+GSM_INTERNAL
 KDEINIT
 KDEDIR
 NETSNMP_CONFIG
 PG_CONFIG
+PTLIB_CONFIG
+PWLIBDIR
+PWLIB_INCDIR
+PWLIB_LIBDIR
+PWLIB_PLATFORM
+OPENH323DIR
+OPENH323_INCDIR
+OPENH323_LIBDIR
+OPENH323_SUFFIX
+OPENH323_BUILD
 QTMOC
 EDITLINE_LIB
 PBX_H323
@@ -800,8 +835,6 @@
 GTK_INCLUDE
 GTK_LIB
 CURL
-PBX_CURL
-CURLLIB
 LTLIBOBJS'
 ac_subst_files=''
       ac_precious_vars='build_alias
@@ -1378,7 +1411,6 @@
 System types:
   --build=BUILD     configure for building on BUILD [guessed]
   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
 _ACEOF
 fi
 
@@ -1396,11 +1428,17 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-asound=PATH      use Advanced Linux Sound Architecture files in PATH
+  --with-cap=PATH         use POSIX 1.e capabilities files in PATH
+  --with-curl=PATH        use cURL files in PATH
   --with-curses=PATH      use curses files in PATH
+  --with-gnutls=PATH      use GNU TLS support (used for iksemel only) files in
+                          PATH
   --with-gsm=PATH         use GSM files in PATH , or 'internal'
   --with-iksemel=PATH     use Iksemel Jabber Library files in PATH
   --with-imap=PATH        use UW IMAP Toolkit files in PATH
+  --with-isdnnet=PATH     use ISDN4Linux Library files in PATH
   --with-kde=PATH         use KDE files in PATH
+  --with-misdn=PATH       use mISDN User Library files in PATH
   --with-nbs=PATH         use Network Broadcast Sound files in PATH
   --with-ncurses=PATH     use ncurses files in PATH
   --with-netsnmp=PATH     use Net-SNMP files in PATH
@@ -1412,11 +1450,14 @@
   --with-popt=PATH        use popt files in PATH
   --with-postgres=PATH    use PostgreSQL files in PATH
   --with-pri=PATH         use ISDN PRI files in PATH
+  --with-ss7=PATH         use ISDN SS7 files in PATH
   --with-pwlib=PATH       use PWlib files in PATH
+  --with-h323=PATH        use OpenH323 files in PATH
   --with-qt=PATH          use Qt files in PATH
   --with-radius=PATH      use Radius Client files in PATH
   --with-speex=PATH       use Speex files in PATH
   --with-sqlite=PATH      use SQLite files in PATH
+  --with-suppserv=PATH    use mISDN Supplemental Services files in PATH
   --with-ssl=PATH         use OpenSSL files in PATH
   --with-tds=PATH         use FreeTDS files in PATH
   --with-termcap=PATH     use Termcap files in PATH
@@ -1503,7 +1544,7 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.59e
+generated by GNU Autoconf 2.60a
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1519,7 +1560,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.59e.  Invocation command line was
+generated by GNU Autoconf 2.60a.  Invocation command line was
 
   $ $0 $@
 
@@ -1979,49 +2020,6 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
 
 # check existence of the package
 
@@ -2033,9 +2031,11 @@
 
 
 
-case "${host}" in
-     *freebsd*)
+case "${host_os}" in
+     freebsd*)
      ac_default_prefix=/usr/local
+     CPPFLAGS=-I/usr/local/include
+     LDFLAGS=-L/usr/local/lib
      ;;
      *)
      ac_default_prefix=/usr
@@ -2052,35 +2052,43 @@
      localstatedir=/var
 fi
 
-### ** Platform.
-
-cat >>confdefs.h <<_ACEOF
-#define PBX_PLATFORM "${host}"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PBX_CPU "${host_cpu}"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PBX_VENDOR "${host_vendor}"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PBX_OS "${host_os}"
-_ACEOF
-
-
-# export some useful defines
-PBX_PLATFORM=${host}
-PBX_CPU=${host_cpu}
-PBX_VENDOR=${host_vendor}
-PBX_OS=${host_os}
-
-
+BUILD_PLATFORM=${build}
+BUILD_CPU=${build_cpu}
+BUILD_VENDOR=${build_vendor}
+BUILD_OS=${build_os}
+
+
+
+
+
+
+HOST_PLATFORM=${host}
+HOST_CPU=${host_cpu}
+HOST_VENDOR=${host_vendor}
+HOST_OS=${host_os}
+
+
+
+
+
+
+case "${host_os}" in
+     freebsd*)
+     OSARCH=FreeBSD
+     ;;
+     netbsd*)
+     OSARCH=NetBSD
+     ;;
+     openbsd*)
+     OSARCH=OpenBSD
+     ;;
+     solaris*)
+     OSARCH=SunOS
+     ;;
+     *)
+     OSARCH=${HOST_OS}
+     ;;
+esac
 
 
 
@@ -2192,86 +2200,6 @@
 fi
 
 
-# guest OS type
-case "${host}" in
-  cygwin*|mingw*|windows*|winnt)
-
-cat >>confdefs.h <<\_ACEOF
-#define Win32 1
-_ACEOF
-
-    PBX_OSTYPE="CYGWIN"
-# this is ugly - KPF
-  OSISWIN32=1
-
-    ;;
-  *linux*)
-
-cat >>confdefs.h <<\_ACEOF
-#define Linux 1
-_ACEOF
-
-    PBX_OSTYPE="Linux"
-    ;;
-  *netbsd*)
-
-cat >>confdefs.h <<\_ACEOF
-#define NetBSD 1
-_ACEOF
-
-    PBX_OSTYPE="NetBSD"
-    ;;
-  *freebsd*)
-
-cat >>confdefs.h <<\_ACEOF
-#define FreeBSD 1
-_ACEOF
-
-    PBX_OSTYPE="FreeBSD"
-    # XXX temporary hack to let FreeBSD use the default paths
-    # for local stuff. We need a better solution.
-    if test x"${CPPFLAGS}" = x; then
-        CPPFLAGS="-I/usr/local/include"
-    fi
-    if test x"${LDFLAGS}" = x; then
-        LDFLAGS="-L/usr/local/lib"
-    fi
-    ;;
-  *openbsd*)
-
-cat >>confdefs.h <<\_ACEOF
-#define OpenBSD 1
-_ACEOF
-
-    PBX_OSTYPE="OpenBSD"
-    ;;
-  *sun*)
-
-cat >>confdefs.h <<\_ACEOF
-#define SunOS 1
-_ACEOF
-
-    PBX_OSTYPE="SunOS"
-    ;;
-  *darwin*)
-
-cat >>confdefs.h <<\_ACEOF
-#define Darwin 1
-_ACEOF
-
-    PBX_OSTYPE="Darwin"
-    ;;
-  *)
-
-cat >>confdefs.h <<\_ACEOF
-#define Unix 1
-_ACEOF
-
-    PBX_OSTYPE="Unix"
-   ;;
-esac
-
-
 # This needs to be before any macros that use the C compiler
 
 cat >>confdefs.h <<\_ACEOF
@@ -2287,7 +2215,7 @@
 
 
 # cross-compile checks
-if test x"${build}" != x"${host}";
+if test "${cross_compiling}" = "yes";
 then
    if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
@@ -2482,6 +2410,102 @@
 fi
 
    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ld; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$LD"; then
+  ac_cv_prog_LD="$LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LD="${ac_tool_prefix}ld"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+LD=$ac_cv_prog_LD
+if test -n "$LD"; then
+  { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LD"; then
+  ac_ct_LD=$LD
+  # Extract the first word of "ld", so it can be a program name with args.
+set dummy ld; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_LD"; then
+  ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_LD="ld"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LD=$ac_cv_prog_ac_ct_LD
+if test -n "$ac_ct_LD"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
+echo "${ECHO_T}$ac_ct_LD" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  if test "x$ac_ct_LD" = x; then
+    LD=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    LD=$ac_ct_LD
+  fi
+else
+  LD="$ac_cv_prog_LD"
+fi
+
+   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -2673,299 +2697,6 @@
   AR="$ac_cv_prog_AR"
 fi
 
-
-   if test x"${PBX_OSTYPE}" = xWin32;
-   then
-      if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nm; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NM="${ac_tool_prefix}nm"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-NM=$ac_cv_prog_NM
-if test -n "$NM"; then
-  { echo "$as_me:$LINENO: result: $NM" >&5
-echo "${ECHO_T}$NM" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NM"; then
-  ac_ct_NM=$NM
-  # Extract the first word of "nm", so it can be a program name with args.
-set dummy nm; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_NM"; then
-  ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NM="nm"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NM=$ac_cv_prog_ac_ct_NM
-if test -n "$ac_ct_NM"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
-echo "${ECHO_T}$ac_ct_NM" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_NM" = x; then
-    NM=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    NM=$ac_ct_NM
-  fi
-else
-  NM="$ac_cv_prog_NM"
-fi
-

[... 21226 lines stripped ...]


More information about the asterisk-commits mailing list