diff --git a/Makefile.am b/Makefile.am
index a64a1c9..440d36d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,7 +69,9 @@ endif
 if WITH_HISI_NS_DECODE
    rasdaemon_SOURCES += non-standard-hisi_hip08.c non-standard-hisilicon.c
 endif
-rasdaemon_SOURCES += rbtree.c ras-page-isolation.c
+if WITH_PFA
+   rasdaemon_SOURCES += rbtree.c ras-page-isolation.c
+endif
 if WITH_AMP_NS_DECODE
    rasdaemon_SOURCES += non-standard-ampere.c
 endif
diff --git a/configure.ac b/configure.ac
index 3668672..a30f661 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,6 +192,8 @@ AS_IF([test "x$enable_memory_row_ce_pfa" = "xyes" || test "x$enable_all" == "xye
 AM_CONDITIONAL([WITH_MEMORY_ROW_CE_PFA], [test x$enable_memory_row_ce_pfa = xyes || test x$enable_all == xyes])
 AM_COND_IF([WITH_MEMORY_ROW_CE_PFA], [USE_MEMORY_ROW_CE_PFA="yes"], [USE_MEMORY_ROW_CE_PFA="no"])
 
+AM_CONDITIONAL([WITH_PFA], [test x$USE_MEMORY_CE_PFA = xyes || test x$USE_MEMORY_ROW_CE_PFA = xyes])
+
 AC_ARG_ENABLE([amp_ns_decode],
     AS_HELP_STRING([--enable-amp-ns-decode], [enable AMP_NS_DECODE events (currently experimental)]))