From 7546530050ee20761639dc3af72c468b5be7e092 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Wed, 21 Sep 2022 23:13:20 +1000
Subject: [PATCH] ArduSub: correct compilation with rally disabled

---
 ArduSub/Parameters.cpp | 2 +-
 ArduSub/Sub.h          | 6 +-----
 ArduSub/config.h       | 4 ----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ArduSub/Parameters.cpp b/ArduSub/Parameters.cpp
index 8e2fa53221..bdea7800aa 100644
--- a/ArduSub/Parameters.cpp
+++ b/ArduSub/Parameters.cpp
@@ -549,7 +549,7 @@ const AP_Param::Info Sub::var_info[] = {
     GOBJECT(avoid,      "AVOID_",   AC_Avoid),
 #endif
 
-#if AC_RALLY == ENABLED
+#if HAL_RALLY_ENABLED
     // @Group: RALLY_
     // @Path: ../libraries/AP_Rally/AP_Rally.cpp
     GOBJECT(rally,      "RALLY_",   AP_Rally),
diff --git a/ArduSub/Sub.h b/ArduSub/Sub.h
index be74602a40..af49987d1e 100644
--- a/ArduSub/Sub.h
+++ b/ArduSub/Sub.h
@@ -95,10 +95,6 @@
 #include <AC_Avoidance/AC_Avoid.h>           // Stop at fence library
 #endif
 
-#if AC_RALLY == ENABLED
-#include <AP_Rally/AP_Rally.h>           // Rally point library
-#endif
-
 #include <AP_Camera/AP_Camera.h>          // Photo or video camera
 
 #if AP_SCRIPTING_ENABLED
@@ -348,7 +344,7 @@ private:
 #endif
 
     // Rally library
-#if AC_RALLY == ENABLED
+#if HAL_RALLY_ENABLED
     AP_Rally rally;
 #endif
 
diff --git a/ArduSub/config.h b/ArduSub/config.h
index af0e6fc52c..c97107c5b3 100644
--- a/ArduSub/config.h
+++ b/ArduSub/config.h
@@ -214,7 +214,3 @@
     MASK_LOG_CAMERA | \
     MASK_LOG_MOTBATT
 #endif
-
-#ifndef AC_RALLY
-#define AC_RALLY   DISABLED
-#endif