Fixing the compile again; CRM_DIR was getting checked for after the

substitution, sorry.

CVS patchset: 2294
CVS date: 2004/01/15 16:58:31

--HG--
extra : convert_revision : 858e70a37fe23de640a5c206df3b6506774ee872

configure.in

@@ -8,7 +8,7 @@ dnl Initialiase, with sanity check of a unique file in the hierarchy
 AC_INIT(heartbeat.spec.in)
 
 AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.221 $) dnl cvs revision
+AC_REVISION($Revision: 1.222 $) dnl cvs revision
 AC_CANONICAL_HOST
 
 
@@ -1207,6 +1207,27 @@ AC_SUBST(ECHO_C)
 AC_SUBST(ECHO_E)
 AC_SUBST(ECHO_CMD)
 
+AC_ARG_ENABLE([crm],
+[  --enable-crm  Compile the new Cluster Resource Manager.
+                          This is still in very early developement stage.  [default=no]]) 
+
+if test "${enable_crm+set}"  = "set"; then
+	echo "Enabling the new Cluster Resource Manager"
+	AC_DEFINE_UNQUOTED(WITH_CRM, 1, Use the new Cluster Resource Manager)
+ 	CRM_DIR="crm"
+dnl	sinclude([config/crm_subagent.m4]) 
+dnl	LIB_CRM
+ 	CRM_ENABLED=1
+ 	AC_SUBST(CRM_ENABLED)
+ 	AC_SUBST(CRM_LIBS)
+else
+ 	CRM_ENABLED=0
+ 	AC_SUBST(CRM_ENABLED)
+ 	CRM_DIR=""
+fi
+
+AC_SUBST(CRM_DIR)
+
 dnl **********************************************************************
 dnl	Enable optional, experimental directories here...
 dnl
@@ -1302,27 +1323,6 @@ telecom/Makefile						\
 )
 
 
-AC_ARG_ENABLE([crm],
-[  --enable-crm  Compile the new Cluster Resource Manager.
-                          This is still in very early developement stage.  [default=no]]) 
-
-if test "${enable_crm+set}"  = "set"; then
-	echo "Enabling the new Cluster Resource Manager"
-	AC_DEFINE_UNQUOTED(WITH_CRM, 1, Use the new Cluster Resource Manager)
- 	CRM_DIR="crm"
-dnl	sinclude([config/crm_subagent.m4]) 
-dnl	LIB_CRM
- 	CRM_ENABLED=1
- 	AC_SUBST(CRM_ENABLED)
- 	AC_SUBST(CRM_LIBS)
-else
- 	CRM_ENABLED=0
- 	AC_SUBST(CRM_ENABLED)
- 	CRM_DIR=""
-fi
-
-AC_SUBST(CRM_DIR)
-
 dnl testing again makes the eventual output a little easier to read
 if test "${enable_crm+set}"  = "set"; then
     AC_OUTPUT(crm/Makefile				    \