Add guard headers.

Found by LGTM.

While here, tidy configure output.

4 files changed, 16 insertions, 1 deletions

diff --git a/configure b/configure
index e36b54c..ed83221 100755
--- a/configure
+++ b/configure
@@ -431,7 +431,7 @@ if [ -z "$WITH_QT" -o "$WITH_QT" != no ]; then
 		QMAKE_CONFIG="$QMAKE_CONFIG SYSCONFDIR=$SYSCONFDIR"
 		QMAKE_CONFIG="$QMAKE_CONFIG MANDIR=$MANDIR"
 		if (cd src/dhcpcd-qt; $QMAKE $QMAKE_CONFIG dhcpcd-qt.pro); then
-			UI="$UI${UI+ }dhcpcd-qt"
+			UI="$UI${UI:+ }dhcpcd-qt"
 		else
 			echo "Failed to configure dhcpcd-qt" >&2
 			[ -n "$WITH_QT" ] && exit 1
diff --git a/src/dhcpcd-qt/dhcpcd-ifmenu.h b/src/dhcpcd-qt/dhcpcd-ifmenu.h
index be10391..b79bf42 100644
--- a/src/dhcpcd-qt/dhcpcd-ifmenu.h
+++ b/src/dhcpcd-qt/dhcpcd-ifmenu.h
@@ -24,6 +24,9 @@
  * SUCH DAMAGE.
  */
 
+#ifndef DHCPCD_IFMENU
+#define	DHCPCD_IFMENU
+
 #include <QMenu>
 
 #include "dhcpcd.h"
@@ -39,3 +42,5 @@ public:
 private:
 	DHCPCD_IF *ifp;
 };
+
+#endif
diff --git a/src/dhcpcd-qt/dhcpcd-ssidmenu.h b/src/dhcpcd-qt/dhcpcd-ssidmenu.h
index 15e3d93..b583a1f 100644
--- a/src/dhcpcd-qt/dhcpcd-ssidmenu.h
+++ b/src/dhcpcd-qt/dhcpcd-ssidmenu.h
@@ -24,6 +24,9 @@
  * SUCH DAMAGE.
  */
 
+#ifndef DHCPCD_SSIDMENU
+#define	DHCPCD_SSIDMENU
+
 #include <QWidgetAction>
 
 #include "dhcpcd.h"
@@ -61,3 +64,5 @@ private:
 	DHCPCD_WI_SCAN *scan;
 	DhcpcdSsidMenuWidget *ssidWidget;
 };
+
+#endif
diff --git a/src/dhcpcd-qt/dhcpcd-ssidmenuwidget.h b/src/dhcpcd-qt/dhcpcd-ssidmenuwidget.h
index caa2e44..673802e 100644
--- a/src/dhcpcd-qt/dhcpcd-ssidmenuwidget.h
+++ b/src/dhcpcd-qt/dhcpcd-ssidmenuwidget.h
@@ -24,6 +24,9 @@
  * SUCH DAMAGE.
  */
 
+#ifndef DHCPCD_SSIDMENUWIDGET
+#define	DHCPCD_SSIDMENUWIDGET
+
 #include <QFrame>
 
 #include "dhcpcd.h"
@@ -69,3 +72,5 @@ private:
 	QLabel *encicon;
 	QLabel *stricon;
 };
+
+#endif