Index: driver/Makefile.am
===================================================================
--- driver/Makefile.am	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ driver/Makefile.am	(revision c59712ef719214c06c49604e482d89f51c7745d4)
@@ -17,14 +17,4 @@
 # applies to both programs
 AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
-if BUILD_NO_LIB
-else
-AM_CXXFLAGS += -DHAVE_LIBCFA
-endif
-if BUILD_DEBUG
-AM_CXXFLAGS += -DHAVE_LIBCFA_DEBUG
-endif
-if BUILD_RELEASE
-AM_CXXFLAGS += -DHAVE_LIBCFA_RELEASE
-endif
 
 # don't install cfa directly
Index: driver/Makefile.in
===================================================================
--- driver/Makefile.in	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ driver/Makefile.in	(revision c59712ef719214c06c49604e482d89f51c7745d4)
@@ -92,7 +92,4 @@
 build_triplet = @build@
 host_triplet = @host@
-@BUILD_NO_LIB_FALSE@am__append_1 = -DHAVE_LIBCFA
-@BUILD_DEBUG_TRUE@am__append_2 = -DHAVE_LIBCFA_DEBUG
-@BUILD_RELEASE_TRUE@am__append_3 = -DHAVE_LIBCFA_RELEASE
 noinst_PROGRAMS = cfa$(EXEEXT)
 cc1lib_PROGRAMS = cc1$(EXEEXT)
@@ -222,8 +219,9 @@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-MACHINE_TYPE = @MACHINE_TYPE@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -241,4 +239,5 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
@@ -298,6 +297,5 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src \
-	$(am__append_1) $(am__append_2) $(am__append_3)
+AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
 cfa_SOURCES = cfa.cc
 
Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ driver/cfa.cc	(revision c59712ef719214c06c49604e482d89f51c7745d4)
@@ -320,19 +320,5 @@
 	nargs += 1;
 
-	#ifdef HAVE_LIBCFA
 	if ( link ) {
-		#if ! defined(HAVE_LIBCFA_RELEASE)
-		if ( ! debug ) {
-			cerr << "error: Option -nodebug is unavailable, libcfa was not installed." << endl;
-			exit( EXIT_FAILURE );
-		} // if
-		#endif
-		#if ! defined(HAVE_LIBCFA_DEBUG)
-		if ( debug ) {
-			cerr << "error: Option -debug is unavailable, libcfa-d was not installed." << endl;
-			exit( EXIT_FAILURE );
-		} // if
-		#endif
-
 		args[nargs] = "-Xlinker";
 		nargs += 1;
@@ -364,5 +350,4 @@
 		nargs += 1;
 	} // if
-	#endif // HAVE_LIBCFA
 
 	// Add exception flags (unconditionally)