Index: src/driver/Makefile.am
===================================================================
--- src/driver/Makefile.am	(revision 6bfe5ccc1d78c01439fa96da7aa6e457acdfb106)
+++ src/driver/Makefile.am	(revision 623c16ab8634ddb9a4f072fd8516d987872c869d)
@@ -11,10 +11,10 @@
 ## Created On       : Sun May 31 08:49:31 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Fri Oct 28 13:46:06 2016
-## Update Count     : 10
+## Last Modified On : Mon Apr 30 17:44:17 2018
+## Update Count     : 11
 ###############################################################################
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2 -g -std=c++14
+AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
 if BUILD_NO_LIB
 else
Index: src/driver/Makefile.in
===================================================================
--- src/driver/Makefile.in	(revision 6bfe5ccc1d78c01439fa96da7aa6e457acdfb106)
+++ src/driver/Makefile.in	(revision 623c16ab8634ddb9a4f072fd8516d987872c869d)
@@ -294,6 +294,6 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2 -g -std=c++14 $(am__append_1) $(am__append_2) \
-	$(am__append_3)
+AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src \
+	$(am__append_1) $(am__append_2) $(am__append_3)
 cfa_SOURCES = cfa.cc
 
Index: src/driver/cfa.cc
===================================================================
--- src/driver/cfa.cc	(revision 6bfe5ccc1d78c01439fa96da7aa6e457acdfb106)
+++ src/driver/cfa.cc	(revision 623c16ab8634ddb9a4f072fd8516d987872c869d)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb  5 22:05:28 2018
-// Update Count     : 166
+// Last Modified On : Wed May  2 14:32:08 2018
+// Update Count     : 222
 //
 
@@ -19,5 +19,7 @@
 #include <unistd.h>										// execvp
 #include <string>										// STL version
-
+#include <string.h>										// strcmp
+
+#include "Common/SemanticError.h"
 #include "config.h"										// configure info
 
@@ -160,4 +162,27 @@
 				args[nargs] = argv[i];					// pass the argument along
 				nargs += 1;
+			} else if ( arg == "-w" ) {
+				args[nargs] = argv[i];					// pass the argument along
+				nargs += 1;
+				args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); // add the argument for cfa-cpp
+				nargs += 1;
+			} else if ( prefix( arg, "-W" ) ) {			// check before next tests
+				if ( arg == "-Werror" || arg == "-Wall" ) {
+					args[nargs] = argv[i];				// pass the argument along
+					nargs += 1;
+					args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); // add the argument for cfa-cpp
+					nargs += 1;
+				} else {
+					unsigned int adv = prefix( arg, "-Wno-" ) ? 5 : 2;
+					args[nargs] = argv[i];				// conditionally pass the argument along
+					char * warning = argv[i] + adv;		// extract warning
+					for ( const auto w : WarningFormats ) {
+						if ( strcmp( warning, w.name ) == 0 ) {	// replace the argument for cfa-cpp
+							args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str();
+							break;
+						} // if
+					} // for
+					nargs += 1;
+				} // if
 			} else if ( prefix( arg, "-B" ) ) {
 				Bprefix = arg.substr(2);				// strip the -B flag
@@ -247,5 +272,5 @@
 		#if ! defined(HAVE_LIBCFA_RELEASE)
 			if( !debug ) {
-				cerr << "error: Option -nodebug is not available, libcfa was not installed." << endl;
+				cerr << "error: Option -nodebug is unavailable, libcfa was not installed." << endl;
 				exit( EXIT_FAILURE );
 				}
@@ -253,5 +278,5 @@
 		#if ! defined(HAVE_LIBCFA_DEBUG)
 			if( debug ) {
-				cerr << "error: Option -debug is not available, libcfa-d was not installed." << endl;
+				cerr << "error: Option -debug is unavailable, libcfa-d was not installed." << endl;
 				exit( EXIT_FAILURE );
 				}