fix inter-dependencies of Softsusy models

configure

@@ -960,7 +960,17 @@ check_models() {
         esac
     done
 
-    # test model dependencies (SoftsusyNMSSM depends on SoftsusyMSSM)
+    # test model dependencies (SoftsusyFlavourMSSM -> SoftsusyNMSSM -> SoftsusyMSSM)
+    if contains "${MODELS}" "models/SoftsusyFlavourMSSM"; then
+        if contains_not "${MODELS}" "models/SoftsusyNMSSM"; then
+            result "not ok"
+            message "Error: model SoftsusyFlavourMSSM requires SoftsusyMSSM and SoftsusyNMSSM!"
+            message "   Please select these two models as well:"
+            message "   --with-models=SoftsusyMSSM,SoftsusyNMSSM,SoftsusyFlavourMSSM"
+            exit 1
+        fi
+    fi
+
     if contains "${MODELS}" "models/SoftsusyNMSSM"; then
         if contains_not "${MODELS}" "models/SoftsusyMSSM"; then
             result "not ok"

models/SoftsusyFlavourMSSM/module.mk

@@ -14,12 +14,7 @@ LIBSoftsusyFlavourMSSM_DEP  := \
 
 LIBSoftsusyFlavourMSSM      := $(DIR)/lib$(MODNAME)$(MODULE_LIBEXT)
 
-EXESoftsusyFlavourMSSM_SRC  :=
-
-ifeq ($(WITH_SoftsusyMSSM) $(WITH_SoftsusyNMSSM) $(WITH_SoftsusyFlavourMSSM),yes yes yes)
-EXESoftsusyFlavourMSSM_SRC  += \
-		$(DIR)/run_softpoint.cpp
-endif
+EXESoftsusyFlavourMSSM_SRC  := $(DIR)/run_softpoint.cpp
 
 EXESoftsusyFlavourMSSM_OBJ  := \
 		$(patsubst %.cpp, %.o, $(filter %.cpp, $(EXESoftsusyFlavourMSSM_SRC)))