[svn-commits] file: branch 1.4 r1687 - in /branches/1.4: ./ Makefile ztcfg-dude.c

[svn-commits at lists.digium.com]

Author: file
Date: Wed Dec  6 17:25:42 2006
New Revision: 1687

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1687
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/Makefile
    branches/1.4/ztcfg-dude.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=1687&r1=1686&r2=1687
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Wed Dec  6 17:25:42 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: branches/1.4/ztcfg-dude.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/ztcfg-dude.c?view=diff&rev=1687&r1=1686&r2=1687
==============================================================================
--- branches/1.4/ztcfg-dude.c (original)
+++ branches/1.4/ztcfg-dude.c Wed Dec  6 17:25:42 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"