Changes in src/driver/cfa.cc [0edebf8:0e76cf4f]

File:

• src/driver/cfa.cc (modified) (2 diffs)

src/driver/cfa.cc

@@ -231 +231 @@
         } // if
 
+        string d;
+        if ( debug ) {
+                d = "-d";
+        } // if
+
         // add the CFA include-library paths, which allow direct access to header files without directory qualification
+
         args[nargs] = "-I" CFA_INCDIR;
         nargs += 1;
@@ -243 +249 @@
         nargs += 1;
 
-#ifdef HAVE_LIBCFA
         if ( link ) {
-                #if ! defined(HAVE_LIBCFA_RELEASE)
-                        if( !debug ) { 
-                                cerr << "error: Option -nodebug is not available, libcfa was not installed." << endl;
-                                exit( EXIT_FAILURE );
-                                }
-                #endif
-                #if ! defined(HAVE_LIBCFA_DEBUG)
-                        if( debug ) { 
-                                cerr << "error: Option -debug is not available, libcfa-d was not installed." << endl;
-                                exit( EXIT_FAILURE );
-                                }
-                #endif
-
                 // include the cfa library in case it's needed
                 args[nargs] = "-L" CFA_LIBDIR;
                 nargs += 1;
-                if( debug ) {
-                        args[nargs] = "-lcfa-d";
-                } else {
-                        args[nargs] = "-lcfa";
-                }
-                nargs += 1;
-        } // if
-#endif //HAVE_LIBCFA
+                args[nargs] = "-lcfa";
+                nargs += 1;
+        } // if
 
         // add the correct set of flags based on the type of compile this is