From b35c214c70eef03039a011a05ceab54de178b62a Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 22 Jun 2015 10:56:17 -0700
Subject: [PATCH] Defer 'Compiling...' message until after AUTOMAKE is checked

- Avoid an export statement in compiler()

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/lib.cli-std | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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