From cdb6825421f4b7b8b46b6cb29dfbb1942d19474b Mon Sep 17 00:00:00 2001 From: crichter Date: Thu, 28 Sep 2006 11:27:09 +0000 Subject: Merged revisions 43775 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r43775 | crichter | 2006-09-27 18:24:51 +0200 (Mi, 27 Sep 2006) | 1 line removed the chan_misdn versioning, since asterisk has it's own ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43854 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/Makefile | 4 ++-- channels/chan_misdn.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/channels/Makefile b/channels/Makefile index 06f15495a..b5f55a368 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -105,8 +105,8 @@ chan_h323.so: chan_h323.o h323/libchanh323.a $(CMD_PREFIX) $(CXX) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat endif -chan_misdn.o: CFLAGS+=-Imisdn -DCHAN_MISDN_VERSION=\"0.3.0\" +chan_misdn.o: CFLAGS+=-Imisdn -misdn_config.o: CFLAGS+=-Imisdn -DCHAN_MISDN_VERSION=\"0.3.0\" +misdn_config.o: CFLAGS+=-Imisdn $(chan_misdn): chan_misdn.o misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index ea3bc0776..84e4c1c54 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -857,7 +857,6 @@ static int misdn_show_config (int fd, int argc, char *argv[]) if (argc == 3 || onlyport == 0) { ast_cli(fd,"Misdn General-Config: \n"); - ast_cli(fd," -> Version: chan_misdn-" CHAN_MISDN_VERSION "\n"); for (elem = MISDN_GEN_FIRST + 1, linebreak = 1; elem < MISDN_GEN_LAST; elem++, linebreak++) { misdn_cfg_get_config_string( 0, elem, buffer, BUFFERSIZE); ast_cli(fd, "%-36s%s", buffer, !(linebreak % 2) ? "\n" : ""); -- cgit v1.2.3