Defer 'Compiling...' message until after AUTOMAKE is checked

- Avoid an export statement in compiler()

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2015-06-22 10:56:17 -07:00
parent 267d6c87be
commit b35c214c70

View File

@ -387,8 +387,6 @@ compiler() {
# #
get_config Yes get_config Yes
[ -n "$g_doing" ] && progress_message3 "$g_doing..."
case $COMMAND in case $COMMAND in
*start|try|refresh) *start|try|refresh)
;; ;;
@ -448,12 +446,12 @@ compiler() {
PERL=/usr/bin/perl PERL=/usr/bin/perl
fi fi
[ -n "$g_doing" ] && progress_message3 "$g_doing..."
if [ ${PERLLIBDIR} = ${LIBEXECDIR}/shorewall ]; then if [ ${PERLLIBDIR} = ${LIBEXECDIR}/shorewall ]; then
$PERL $debugflags $pc $options $@ $PERL $debugflags $pc $options $@
else else
PERL5LIB=${PERLLIBDIR} PERL5LIB=${PERLLIBDIR} $PERL $debugflags $pc $options $@
export PERL5LIB
$PERL $debugflags $pc $options $@
fi fi
} }