[zaptel-commits] file: trunk r1688 - in /trunk: ./ Makefile ztcfg-dude.c

[zaptel-commits at lists.digium.com]

Author: file
Date: Wed Dec  6 17:28:26 2006
New Revision: 1688

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1688
Log:
Merged revisions 1687 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1687 | file | 2006-12-06 18:25:42 -0500 (Wed, 06 Dec 2006) | 10 lines

Merged revisions 1686 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1686 | file | 2006-12-06 18:22:11 -0500 (Wed, 06 Dec 2006) | 2 lines

Link ztcfg-dude against stdc++ so we get needed functions. (issue #8494 reported by Romik)

........

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

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/ztcfg-dude.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Dec  6 17:28:26 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687

Propchange: trunk/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Wed Dec  6 17:28:26 2006
@@ -1,2 +1,2 @@
-menuselect     https://origsvn.digium.com/svn/menuselect/trunk
-oct612x	       https://origsvn.digium.com/svn/octasic_api/oct612x/trunk/software
+menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0
+oct612x https://origsvn.digium.com/svn/octasic_api/oct612x/tags/PR43-00/software

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=1688&r1=1687&r2=1688
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Dec  6 17:28:26 2006
@@ -295,7 +295,7 @@
 	$(CC) -o $@ $^ -lm
 
 ztcfg-dude: ztcfg-dude.o mknotch.o complex.o $(LTZ_SO)
-	$(CC) -o $@ $^ -lm
+	$(CC) -o $@ $^ -lm -lstdc++
 
 mknotch.o: mknotch.cc
 	$(CC) -o $@ -c $^

Modified: trunk/ztcfg-dude.c
URL: http://svn.digium.com/view/zaptel/trunk/ztcfg-dude.c?view=diff&rev=1688&r1=1687&r2=1688
==============================================================================
--- trunk/ztcfg-dude.c (original)
+++ trunk/ztcfg-dude.c Wed Dec  6 17:28:26 2006
@@ -40,8 +40,10 @@
 #include <math.h>
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
+#include "tonezone.h"
 #else
 #include <zaptel/zaptel.h>
+#include <zaptel/tonezone.h>
 #endif
 #include "ztcfg.h"