From acd8d74316f822743a8255e348c4a5ab4d66d776 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 3 Oct 2014 12:48:37 -0400 Subject: [PATCH] cleanup conditions --- Makefile.am | 3 +++ configure.ac | 2 ++ libs/esl/Makefile.am | 4 ++++ libs/esl/fs_cli.c | 5 ++++- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0ad0f679ce..1a1befe7e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -330,6 +330,9 @@ fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_e fs_cli_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include $(LIBEDIT_CFLAGS) fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) -lm $(LIBEDIT_LIBS) +if DISABLE_CC +fs_cli_CFLAGS += -DDISABLE_CC +endif ## ## fs_encode () diff --git a/configure.ac b/configure.ac index b41bdc4118..696a7f4554 100644 --- a/configure.ac +++ b/configure.ac @@ -498,6 +498,8 @@ AC_ARG_ENABLE(cpp, AM_CONDITIONAL([ENABLE_CPP],[test "${enable_cpp}" = "yes"]) +AM_CONDITIONAL([DISABLE_CC],[test "${disable_cc}" = "yes"]) + AC_ARG_ENABLE([system-xmlrpc-c], [AS_HELP_STRING([--enable-system-xmlrpc-c], [use system lib for xmlrpc-c])],, diff --git a/libs/esl/Makefile.am b/libs/esl/Makefile.am index cc84ae3aae..3b1563eaed 100644 --- a/libs/esl/Makefile.am +++ b/libs/esl/Makefile.am @@ -25,6 +25,10 @@ fs_cli_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include $(LIBEDIT_ fs_cli_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(LIBEDIT_LIBS) fs_cli_LDADD = libesl.la +if DISABLE_CC +fs_cli_CFLAGS += -DDISABLE_CC +endif + testclient_SOURCES = testclient.c testclient_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include testclient_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS) $(LIBS) diff --git a/libs/esl/fs_cli.c b/libs/esl/fs_cli.c index 3610ae5219..bab2d5b3b2 100644 --- a/libs/esl/fs_cli.c +++ b/libs/esl/fs_cli.c @@ -1040,8 +1040,11 @@ static void print_banner(FILE *stream, int color) fprintf(stream, "%s%s%s", ESL_SEQ_DEFAULT_COLOR, ESL_SEQ_FYELLOW, ESL_SEQ_BBLUE); } +#ifndef DISABLE_CC fprintf(stream, "%s%s", banner, use); - +#else + fprintf(stream, "%s", banner); +#endif if (color) { fprintf(stream, "%s", ESL_SEQ_DEFAULT_COLOR);