From 14bf405be4c9d9cfd89ee351e77764888230ef48 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 4 Jun 2008 20:07:59 +0000
Subject: [PATCH] Replace checks for RESCUE in sources with checks for
 STATIC_GEOM_CLASSES and define STATIC_GEOM_CLASSES when building the rescue
 binary. This way geom can more easily be part of other crunched binaries, as
 it requires only a Makefile change.

---
 sbin/geom/Makefile                 |  2 +-
 sbin/geom/class/label/geom_label.c |  2 +-
 sbin/geom/class/part/geom_part.c   |  2 +-
 sbin/geom/core/geom.c              | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile
index 0cb98d1f3a54..c357e9d32c95 100644
--- a/sbin/geom/Makefile
+++ b/sbin/geom/Makefile
@@ -10,7 +10,7 @@
 PROG=	geom
 SRCS=	geom.c geom_label.c geom_part.c subr.c
 
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core
+CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES
 
 DPADD=	${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
 LDADD=	-lgeom -lsbuf -lbsdxml -lutil
diff --git a/sbin/geom/class/label/geom_label.c b/sbin/geom/class/label/geom_label.c
index eec20ca7e7a3..e77fdf054a13 100644
--- a/sbin/geom/class/label/geom_label.c
+++ b/sbin/geom/class/label/geom_label.c
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
 #include "core/geom.h"
 #include "misc/subr.h"
 
-#ifdef RESCUE
+#ifdef STATIC_GEOM_CLASSES
 #define PUBSYM(x)	glabel_##x
 #else
 #define PUBSYM(x)	x
diff --git a/sbin/geom/class/part/geom_part.c b/sbin/geom/class/part/geom_part.c
index f462df3d66cf..94e44bef39b3 100644
--- a/sbin/geom/class/part/geom_part.c
+++ b/sbin/geom/class/part/geom_part.c
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
 #include "core/geom.h"
 #include "misc/subr.h"
 
-#ifdef RESCUE
+#ifdef STATIC_GEOM_CLASSES
 #define	PUBSYM(x)	gpart_##x
 #else
 #define	PUBSYM(x)	x
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index 8726e626a9a3..f0d82e8120f9 100644
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 
 #include "misc/subr.h"
 
-#ifdef RESCUE
+#ifdef STATIC_GEOM_CLASSES
 extern uint32_t gpart_version;
 extern struct g_command gpart_class_commands[];
 extern uint32_t glabel_version;
@@ -472,7 +472,7 @@ run_command(int argc, char *argv[])
 	exit(EXIT_SUCCESS);
 }
 
-#ifndef RESCUE
+#ifndef STATIC_GEOM_CLASSES
 static const char *
 library_path(void)
 {
@@ -551,7 +551,7 @@ load_library(void)
 		exit(EXIT_FAILURE);
 	}
 }
-#endif	/* !RESCUE */
+#endif	/* !STATIC_GEOM_CLASSES */
 
 /*
  * Class name should be all capital letters.
@@ -600,7 +600,7 @@ get_class(int *argc, char ***argv)
 		errx(EXIT_FAILURE, "Invalid utility name.");
 	}
 
-#ifndef RESCUE
+#ifndef STATIC_GEOM_CLASSES
 	load_library();
 #else
 	if (!strcasecmp(class_name, "part")) {
@@ -611,7 +611,7 @@ get_class(int *argc, char ***argv)
 		class_commands = glabel_class_commands;
 	} else
 		errx(EXIT_FAILURE, "Invalid class name.");
-#endif /* !RESCUE */
+#endif /* !STATIC_GEOM_CLASSES */
 
 	set_class_name();
 	if (*argc < 1)