diff --git a/configure.ac b/configure.ac
index 782ad1ce..92c7a07b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,6 +478,9 @@ dnl -----------------------------------------------
 dnl Specify the files that are going to be created by configure
 dnl -----------------------------------------------
 
+AM_CONDITIONAL([BMW_OPT], [test "${BUILD_BMW_LIBS}" -eq 1])
+AM_CONDITIONAL([AS_OPT], [test "${BUILD_AS_LIBS}" -eq 1])
+
 AC_CONFIG_FILES([Makefile \
                  src/Makefile \
                  src/classes/Makefile \
@@ -490,18 +493,12 @@ AC_CONFIG_FILES([Makefile \
                  src/external/MuSR_software/Class_MuSR_PSI/Class_MuSR_PSI.pc \
                  src/external/mud/Makefile \
                  src/external/mud/src/Makefile \
-                 src/external/mud/src/mud.pc])
-
-if test "${BUILD_BMW_LIBS}" -eq 1; then
-  AC_CONFIG_FILES([src/external/TFitPofB-lib/Makefile \
+                 src/external/mud/src/mud.pc \
+                 src/external/TFitPofB-lib/Makefile \
                  src/external/TFitPofB-lib/classes/Makefile \
                  src/external/libLFRelaxation/Makefile \
                  src/external/libGapIntegrals/Makefile \
-                 src/external/libCalcMeanFieldsLEM/Makefile])
-fi
-
-if test "${BUILD_AS_LIBS}" -eq 1; then
-  AC_CONFIG_FILES([src/external/Nonlocal/Makefile])
-fi
+                 src/external/libCalcMeanFieldsLEM/Makefile \
+                 src/external/Nonlocal/Makefile])
 
 AC_OUTPUT
diff --git a/src/external/Makefile.am b/src/external/Makefile.am
index 264e1c7f..0542056d 100644
--- a/src/external/Makefile.am
+++ b/src/external/Makefile.am
@@ -1,5 +1,12 @@
-SUBDIRS = TFitPofB-lib \
-          libLFRelaxation \
-          libGapIntegrals \
-          libCalcMeanFieldsLEM \
-          Nonlocal
+if AS_OPT
+  ASDIRS = Nonlocal
+endif
+
+if BMW_OPT
+  BMWDIRS = TFitPofB-lib \
+            libLFRelaxation \
+            libGapIntegrals \
+            libCalcMeanFieldsLEM 
+endif
+
+SUBDIRS = $(ASDIRS) $(BMWDIRS)