The attached patch fixes the two problems in sipxtacklib Makefile:
The following files are included twice:
net/SipDialog.h
net/SipDialogMgr.h
net/SipDialogEvent.h
The preprocessor also doesnt work with @@ECHO@, so I replaced it with @echo.
These problems cause build to fail on SUSE Linux.
The patch is for the 4.0.4 release but should apply to SVN trunk as well with
a small difference in line numbers.
(There is possibly a better wy to fix the preprocessor issue, but this works
for me..)
Regards
--
Peter Nixon
http://peternixon.net/
--- include/Makefile.am.orig 2010-03-21 01:33:21.000000000 +0200
+++ include/Makefile.am 2010-03-21 02:14:51.000000000 +0200
@@ -54,10 +54,7 @@
net/SipDialog.h \
net/SipDialogEvent.h \
net/SipDialogMgr.h \
- net/SipDialog.h \
- net/SipDialogMgr.h \
net/SipDialogMonitor.h \
- net/SipDialogEvent.h \
net/SipLineCredentials.h \
net/SipLineEvent.h \
net/SipLine.h \
@@ -121,11 +118,11 @@
net/version.h: .FORCE
@test -d net || mkdir net
- @@ECHO@ '#ifndef SIP_STACK_VERSION' > net/version_new.h
- @@ECHO@ -n '#define SIP_STACK_VERSION "' >> net/version_new.h
- @@ECHO@ -n @VERSION@ >> net/version_new.h
- @@ECHO@ '"' >> net/version_new.h
- @@ECHO@ '#endif' >> net/version_new.h
+ @echo '#ifndef SIP_STACK_VERSION' > net/version_new.h
+ @echo -n '#define SIP_STACK_VERSION "' >> net/version_new.h
+ @echo -n @VERSION@ >> net/version_new.h
+ @echo '"' >> net/version_new.h
+ @echo '#endif' >> net/version_new.h
@if test ! -r net/version.h || ! diff net/version.h net/version_new.h > /dev/null \
;then \
echo sipXtack version is @VERSION@ \
_______________________________________________
sipx-dev mailing list [email protected]
List Archive: http://list.sipfoundry.org/archive/sipx-dev
Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev
sipXecs IP PBX -- http://www.sipfoundry.org/
