From 4f870c4fd0d671e4a89d32028f146cba83bf2802 Mon Sep 17 00:00:00 2001
From: Lon Hohberger <lon@users.sourceforge.net>
Date: Wed, 23 Sep 2009 12:04:32 -0400
Subject: [PATCH] Make symlink/compatibilty mode disabled by default

Signed-off-by: Lon Hohberger <lon@users.sourceforge.net>
---
 Makefile.in        |  2 +-
 client/Makefile.in | 19 ++++++++++++++++---
 common/Makefile.in |  2 +-
 config/Makefile.in |  2 +-
 configure.in       |  9 +++++++++
 server/Makefile.in |  2 +-
 6 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c637855..a34f378 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2006 Red Hat, Inc.
+##  Copyright (C) 2009 Red Hat, Inc.
 ##  
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
diff --git a/client/Makefile.in b/client/Makefile.in
index 9ff6e81..888bad1 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,18 +1,21 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2006 Red Hat, Inc.
+##  Copyright (C) 2009 Red Hat, Inc.
 ##  
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
-##  of the GNU General Public License v.2.
+##  of the GNU General Public License v.2
 ##
 ###############################################################################
 ###############################################################################
 
 include ../Makefile.top
 
+# Serial mode
 TARGET=fence_virt
+
+# XVM/Multicast mode compatibility link
 LINK=fence_xvm
 
 fence_virt_SOURCES = mcast.c serial.c main.c options.c
@@ -23,7 +26,15 @@ INCLUDES=-I../include `nss-config --cflags` `nspr-config --cflags` \
 # nss sucks in way too much stuff
 LIBS+=-lnss3 `xml2-config --libs`
 
-all: ${TARGET} ${LINK}
+TARGETS=${TARGET}
+
+# From configure script
+xvm_compat=@xvm_compat@
+ifeq ($(xvm_compat),yes)
+TARGETS+=${LINK}
+endif
+
+all: ${TARGETS}
 
 fence_xvm: ${TARGET}
 	ln -snf $^ $@
@@ -39,7 +50,9 @@ install: all
 		install -d ${DESTDIR}/${sbindir} ; \
 	fi
 	install -m755 ${TARGET} ${DESTDIR}/${sbindir}
+ifeq ($(xvm_compat),yes)
 	cp -a ${LINK} ${DESTDIR}/${sbindir}
+endif
 
 clean:
 	rm -f ${TARGET} ${LINK} *.o *.d *~
diff --git a/common/Makefile.in b/common/Makefile.in
index 81a9db1..e3b470b 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2006 Red Hat, Inc.
+##  Copyright (C) 2009 Red Hat, Inc.
 ##  
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
diff --git a/config/Makefile.in b/config/Makefile.in
index bc1e382..6ef0f01 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2006 Red Hat, Inc.
+##  Copyright (C) 2009 Red Hat, Inc.
 ##  
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
diff --git a/configure.in b/configure.in
index 6540d94..cad9029 100644
--- a/configure.in
+++ b/configure.in
@@ -98,6 +98,15 @@ AC_ARG_ENABLE(serial-plugin,
 [ mod_serial=$enableval ], [ mod_serial=no ])
 AC_SUBST(mod_serial)
 
+#
+# Compatibility symlink: disabled by default
+#
+AC_ARG_ENABLE(xvm-compat,
+[AS_HELP_STRING([--enable-xvm-compat],
+		[Enable serial listener plugin])],
+[ xvm_compat=$enableval ], [ xvm_compat=no ])
+AC_SUBST(xvm_compat)
+
 
 AC_CONFIG_FILES([Makefile.top
 		 Makefile
diff --git a/server/Makefile.in b/server/Makefile.in
index 3a0394d..b5004f2 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2006 Red Hat, Inc.
+##  Copyright (C) 2009 Red Hat, Inc.
 ##  
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions