* configure.in (CPPUNIT_LIBS): fixed #1478 always use included

antlr run-time library.

build_num

@@ -1 +1 @@
-#define BUILD_NUM 2932
+#define BUILD_NUM 2934

configure.in

@@ -248,31 +248,17 @@ AC_SUBST(HAVE_CPPUNIT)
 AC_SUBST(CPPUNIT_CFLAGS)
 AC_SUBST(CPPUNIT_LIBS)
 
-AC_PATH_PROG(ANTLR_CONFIG, antlr-config, , [$EXTENDED_PATH])
+dnl A check for antlr-runtime library used to be here but has been
-AC_MSG_CHECKING(antlr)
+dnl removed. We should always use antlr runtime code incuded with
-HAVE_ANTLR_RUNTIME="1"
+dnl fwbuilder code tree because of the fixes I've done in
-HAVE_EXTERNAL_ANTLR="0";
+dnl CurcularQueue.hpp module for 64 bit systems. This problem seems to
-if test x$ANTLR_CONFIG = x; then
+dnl have been fixed in antlr v3 but until we convert all grammars to
-  ANTLR_INCLUDEPATH="`pwd`/src/"
+dnl the new antlr, we have to use provided antlr 2.7.7 with these
-  ANTLR_LIBS="`pwd`/src/antlr/libantlr.a"
+dnl fixes. This means we can't use antlr runtime that comes with the
-  AC_MSG_RESULT(using provided)
+dnl OS even if it is installed.
-else
+
-  ANTLR_VERSION="`$ANTLR_CONFIG --version`"
+ANTLR_INCLUDEPATH="`pwd`/src/"
-  if test x$ANTLR_VERSION != x2.7.7; then
+ANTLR_LIBS="`pwd`/src/antlr/libantlr.a"
-    ANTLR_INCLUDEPATH="`pwd`/src/"
-    ANTLR_LIBS="`pwd`/src/antlr/libantlr.a"
-    AC_MSG_RESULT(using provided)
-  else
-    ANTLR_INCLUDEPATH="`$ANTLR_CONFIG --cflags`"
-    ANTLR_LIBS="`$ANTLR_CONFIG --libs`"
-    HAVE_EXTERNAL_ANTLR="1"
-    AC_MSG_RESULT(using external version $ANTLR_VERSION)
-  fi
-fi
-AC_DEFINE_UNQUOTED(HAVE_ANTLR_RUNTIME, 1, [antlr_runtime])
-AC_DEFINE_UNQUOTED(HAVE_EXTERNAL_ANTLR, $HAVE_EXTERNAL_ANTLR, [external_antlr])
-AC_SUBST(HAVE_ANTLR_RUNTIME)
-AC_SUBST(HAVE_EXTERNAL_ANTLR)
 AC_SUBST(ANTLR_LIBS)
 AC_SUBST(ANTLR_INCLUDEPATH)
 

doc/ChangeLog

@@ -1,3 +1,12 @@
+2010-05-25  vadim  <vadim@vk.crocodile.org>
+
+	* configure.in (CPPUNIT_LIBS): fixed #1478 always use included
+	antlr run-time library. Because of the fixes I've made in
+	CircularQueue?.hpp in 2008 for 64 bit systems, we should always
+	link with antlr run-time that is included with fwbuilder code tree
+	rather than attempt to use the one that might be installed with
+	the OS.
+
 2010-05-24  vadim  <vadim@vk.crocodile.org>
 
 	* UserWorkflow.cpp (UserWorkflow::report): see #1466 Implemented

qmake.inc.in

@@ -11,8 +11,6 @@ UI_DIR = ui
 MANDIR = @MANDIR@
 DOCDIR = @DOCDIR@
 
-HAVE_ANTLR_RUNTIME = @HAVE_ANTLR_RUNTIME@
-HAVE_EXTERNAL_ANTLR = @HAVE_EXTERNAL_ANTLR@
 HAVE_QTDBUS = @HAVE_QTDBUS@
 HAVE_CPPUNIT = @HAVE_CPPUNIT@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@

src/gui/DiscoveryDruid.cpp

@@ -163,9 +163,7 @@ DiscoveryDruid::DiscoveryDruid(QWidget *parent, bool start_with_import) :
     m_dialog->dm_usesnmp->setEnabled(false);
 #endif
 
-#ifndef HAVE_ANTLR_RUNTIME
     m_dialog->dm_import_config->setEnabled(false);
-#endif
 
     restore();
 
@@ -174,7 +172,6 @@ DiscoveryDruid::DiscoveryDruid(QWidget *parent, bool start_with_import) :
     showPage(0);
     setNextEnabled(0, true);
 
-#ifdef HAVE_ANTLR_RUNTIME
     if (start_with_import)
     {
         m_dialog->dm_import_config->setDown(true);
@@ -185,7 +182,6 @@ DiscoveryDruid::DiscoveryDruid(QWidget *parent, bool start_with_import) :
         setNextEnabled(2, true);
         cancelButton->show();
     }
-#endif
 
     prg_timer->start(100);
 }

src/gui/IOSImporterRun.cpp

@@ -34,15 +34,12 @@
 #include <iostream>
 #include <algorithm>
 
-#ifdef HAVE_ANTLR_RUNTIME
 #include <antlr/ANTLRException.hpp>
 
 // parser and lexer for Cisco IOS access lists
 #include "../parsers/IOSCfgLexer.hpp"
 #include "../parsers/IOSCfgParser.hpp"
 
-#endif
-
 /*
  * Only this module depends on IOSCfgLexer and IOSCfgParser,
  * so only this file is recompiled when we change grammar
@@ -50,7 +47,6 @@
 
 void IOSImporter::run()
 {
-#ifdef HAVE_ANTLR_RUNTIME
 // it is probably safer to create an empty firewall if we do not have
 // ANTLR on the system rather than try to #ifdef out chunks of code
 // here and there in this module
@@ -81,6 +77,5 @@ void IOSImporter::run()
 
     if (!err.empty())  throw ImporterException(err);
 
-#endif
 }
 

src/gui/IPTImporterRun.cpp

@@ -34,15 +34,12 @@
 #include <iostream>
 #include <algorithm>
 
-#ifdef HAVE_ANTLR_RUNTIME
 #include <antlr/ANTLRException.hpp>
 
 // parser and lexer for files produced by iptables-save
 #include "../parsers/IPTCfgLexer.hpp"
 #include "../parsers/IPTCfgParser.hpp"
 
-#endif
-
 /*
  * Only this module depends on IPTCfgLexer and IPTCfgParser,
  * so only this file is recompiled when we change grammar
@@ -50,7 +47,6 @@
 
 void IPTImporter::run()
 {
-#ifdef HAVE_ANTLR_RUNTIME
 // it is probably safer to create an empty firewall if we do not have
 // ANTLR on the system rather than try to #ifdef out chunks of code
 // here and there in this module
@@ -81,6 +77,5 @@ void IPTImporter::run()
 
     if (!err.empty())  throw ImporterException(err);
 
-#endif
 }
 

src/gui/gui.pro

@@ -468,12 +468,11 @@ FORMS = FWBMainWindow_q.ui \
 HEADERS += transferDialog.h
 SOURCES += transferDialog.cpp
 FORMS += transferdialog_q.ui
-contains( HAVE_ANTLR_RUNTIME, 1 ) { 
+
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    LIBS += $$FWBPARSER_LIB \
+LIBS += $$FWBPARSER_LIB $$ANTLR_LIBS
-        $$ANTLR_LIBS
+DEFINES += $$ANTLR_DEFINES
-    DEFINES += $$ANTLR_DEFINES
+
-}
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below
 LIBS += $$FWTRANSFER_LIB

src/gui/unit_tests/AddressRangeDialogTest/AddressRangeDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/CustomServiceDialogTest/CustomServiceDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/FWWindowTest/FWWindowTest.pro

@@ -381,12 +381,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/FirewallDialogTest/FirewallDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/GroupObjectDialogTest/GroupObjectDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/ICMP6ServiceDialogTest/ICMP6ServiceDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/ICMPServiceDialogTest/ICMPServiceDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/IPDialogTest/IPDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/IPServiceDialogTest/IPServiceDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/InterfaceDialogTest/InterfaceDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/NetworkDialogTest/NetworkDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/ObjectManipulatorTest/ObjectManipulatorTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/RuleSetViewContextMenuTest/RuleSetViewContextMenuTest.pro

@@ -50,12 +50,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/RuleSetViewTest/RuleSetViewTest.pro

@@ -50,12 +50,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/TCPServiceDialogTest/TCPServiceDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/TagServiceDialogTest/TagServiceDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/UDPServiceDialogTest/UDPServiceDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/UserSerivceDialogTest/UserServiceDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/genericDialogTest/genericDialogTest.pro

@@ -43,12 +43,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/instDialogClusterTest/instDialogClusterTest.pro

@@ -52,12 +52,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/instDialogCompileTest/instDialogCompileTest.pro

@@ -52,12 +52,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/instDialogInstallTest/instDialogInstallTest.pro

@@ -52,12 +52,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/instDialogObjectListTest/instDialogObjectListTest.pro

@@ -52,12 +52,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/gui/unit_tests/newClusterDialogTest/newClusterDialogTest.pro

@@ -48,12 +48,10 @@ clean_tests.depends = all
 QMAKE_EXTRA_TARGETS += run_tests build_tests clean_tests
 
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-    INCLUDEPATH += $$ANTLR_INCLUDEPATH
+LIBS += ../../$$FWBPARSER_LIB $$ANTLR_LIBS
-    LIBS += ../../$$FWBPARSER_LIB \
+DEFINES += $$ANTLR_DEFINES
-        $$ANTLR_LIBS
+
-    DEFINES += $$ANTLR_DEFINES
-}
 LIBS += $$LIBS_FWCOMPILER
 
 # fwtransfer lib. Add this before adding -lQtDBus to LIBS below

src/parsers/parsers.pro

@@ -20,11 +20,9 @@ HEADERS	 = ../../config.h    \
 
 CONFIG += staticlib
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+INCLUDEPATH += $$ANTLR_INCLUDEPATH
-	INCLUDEPATH  += $$ANTLR_INCLUDEPATH
+LIBS += $$ANTLR_LIBS
-	LIBS		 += $$ANTLR_LIBS
+DEFINES += $$ANTLR_DEFINES
-	DEFINES		 += $$ANTLR_DEFINES
-}
 
 TARGET   = fwbparser
 

src/src.pro

@@ -8,17 +8,11 @@ TEMPLATE = subdirs
 CONFIG  += ordered
 
 TARGET   = src
-SUBDIRS  = res
-# NOTE: 2.1 does not install scripts from src/tools ( fwb_install , fwb_compile_all)
 
-contains( HAVE_ANTLR_RUNTIME, 1 ) {
+SUBDIRS  =  res \
-  SUBDIRS += parsers
+			parsers \
-  contains ( HAVE_EXTERNAL_ANTLR, 0 ) {
+			antlr \
-    SUBDIRS += antlr
+			common \
-  }
-}
-
-SUBDIRS += common \
 			compiler_lib \
 			fwbedit \
 			fwtransfer \