From 225cc320b73484f7065fdae0fce326ef691f3a7c Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@slot.vk.crocodile.org>
Date: Sat, 25 Dec 2010 20:52:55 -0800
Subject: [PATCH] minor clean up

---
 configure.in                                  | 22 +++++--------------
 src/cisco_lib/cisco_lib.pro                   |  3 ---
 .../src/fwcompiler/fwcompiler.pro             |  5 -----
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/configure.in b/configure.in
index ac621c201..cab37ac5d 100644
--- a/configure.in
+++ b/configure.in
@@ -157,12 +157,12 @@ dnl Check for GNU make
 dnl 
 AC_MSG_CHECKING(whether make is GNU Make)
 if ${MAKE-make} -q --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
-      AC_MSG_RESULT(yes)
+  AC_MSG_RESULT(yes)
 else
-      AC_MSG_RESULT(no)
-      if test "$host_vendor" = "sun" ; then
-              AC_MSG_ERROR("SUN make does not work for building Firewall Builder. Please install GNU make")
-      fi
+  AC_MSG_RESULT(no)
+  if test "$host_vendor" = "sun" ; then
+    AC_MSG_ERROR("SUN make does not work for building Firewall Builder. Please install GNU make")
+  fi
 fi
 
 dnl some platform-dependent flags
@@ -174,18 +174,6 @@ case "$build_os" in
   *solaris*)
     GUILINKFLAGS="-export-dynamic"
     ;;
-  *darwin*)
-    if test -d /sw/include; then
-      CXXFLAGS="-I/sw/include"
-      CPPFLAGS="-I/sw/include"
-      CFLAGS="-I/sw/include"
-      LDFLAGS="-flat_namespace"
-    fi
-    LIBS="$LIBS -L/sw/lib"
-    AC_CHECK_LIB(poll, poll, [LIBS="$LIBS -lpoll"],[
-        AC_MSG_ERROR([Could not link with libpoll: library is not installed on this system]) 
-    ])
-    ;;
  esac
 AC_SUBST(GUILINKFLAGS)
 
diff --git a/src/cisco_lib/cisco_lib.pro b/src/cisco_lib/cisco_lib.pro
index df72fb29c..2013aec94 100644
--- a/src/cisco_lib/cisco_lib.pro
+++ b/src/cisco_lib/cisco_lib.pro
@@ -66,9 +66,6 @@ macx:LIBS  += $$LIBS_FWCOMPILER
 
 INCLUDEPATH += ../compiler_lib ../libfwbuilder/src
 
-# win32:LIBS  += ../compiler_lib/release/compilerdriver.lib
-# !win32:LIBS += ../compiler_lib/libcompilerdriver.a
-
 win32:PRE_TARGETDEPS  = ../compiler_lib/release/compilerdriver.lib
 !win32:PRE_TARGETDEPS = ../compiler_lib/libcompilerdriver.a
 
diff --git a/src/libfwbuilder/src/fwcompiler/fwcompiler.pro b/src/libfwbuilder/src/fwcompiler/fwcompiler.pro
index 22ba859c7..aeede5b74 100644
--- a/src/libfwbuilder/src/fwcompiler/fwcompiler.pro
+++ b/src/libfwbuilder/src/fwcompiler/fwcompiler.pro
@@ -5,7 +5,6 @@ include(../../qmake.inc)
 TEMPLATE = lib
 CONFIG += staticlib
 
-VERSION = $$SO_VERSION
 #
 SOURCES  = 	BaseCompiler.cpp \
 			Compiler.cpp \
@@ -27,10 +26,6 @@ HEADERS  = 	BaseCompiler.h \
 			RuleProcessor.h \
 			RoutingCompiler.h
 
-unix {
-        LIBS += -L../fwbuilder -lfwbuilder
-}
-
 TARGET = fwcompiler
 # target.path = "$$prefix/lib"