cleanup conditions

diff --git a/Makefile.am b/Makefile.am
index 0ad0f679ce1ac7322597278caa02710ce3a0f3c6..1a1befe7e00ecb9504b5633f18a5fd234cd874e3 100644 (file)
--- 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 b41bdc411815d000cf4ac47801f0f5cdde0eb69b..696a7f45547c39901cce2f4ed286ffa68fed0f3b 100644 (file)
--- 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 cc84ae3aae30a283b3954c18bf935c85dd611e7f..3b1563eaede552e0d8752e2dcf10a3c94dc1badd 100644 (file)
--- 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 3610ae5219b029c2cd34cea0a5ac801a789f5629..bab2d5b3b2a18efe3c3a0c38c1bd017923af9afa 100644 (file)
--- 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);