From 25ada4a381af67ed7c2ef653955d5fa421945cd5 Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Thu, 15 Mar 2012 08:40:24 -0600
Subject: [PATCH] Add MFSVERSION to override calculation in MFS localization.
 Add LINUX_FSNODE to indicate that the FSNODE is running LINUX. This is just a
 partial implementation, intended to support some changes contributed by
 Maarten Dewispelaere at intec.ugent.be Note that these changes do not work
 with windows enabled, so I added a check for that.

---
 configure    | 13 +++++++++++++
 configure.in |  9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/configure b/configure
index f81ec04ab..081ac7adf 100755
--- a/configure
+++ b/configure
@@ -733,6 +733,7 @@ TRACK_INTERSWITCH_BANDWIDTH
 TIMESTAMPS
 OURTIMEZONE
 NODECONSOLE
+MFSVERSION
 UNIFIED_BOSS_AND_OPS
 DISABLE_NSE
 DISABLE_NAMED_SETUP
@@ -841,6 +842,7 @@ OPSVM_ENABLE
 OPSVM_MOUNTPOINT
 PORTAL_ENABLE
 PORTAL_ISPRIMARY
+LINUX_FSNODE
 TBOPSEMAIL
 TBOPSEMAIL_NOSLASH
 TBROBOCOPSEMAIL
@@ -4977,6 +4979,8 @@ done
 
 
 
+
+
 
 
 
@@ -5085,8 +5089,10 @@ OPSVM_ENABLE=0
 OPSVM_MOUNTPOINT="/ops"
 OURTIMEZONE="America/Denver"
 NODECONSOLE="sio"
+MFSVERSION=""
 PORTAL_ENABLE=0
 PORTAL_ISPRIMARY=0
+LINUX_FSNODE=0
 
 #
 # XXX You really don't want to change these!
@@ -5618,6 +5624,8 @@ if test "${with_apache_config_dir+set}" = set; then
 
 else
 
+    foo=`httpd -V`
+    echo "httpd: '$foo'"
     foo=`httpd -V | grep SERVER_CONFIG_FILE | grep 'apache2'`
     if test "$foo" = ""; then
         INSTALL_APACHE_CONFIG="/usr/local/etc/apache"
@@ -5745,6 +5753,11 @@ fi
 if test $WINSUPPORT -eq 0; then
 	winfiles="";
 else
+	if test $LINUX_FSNODE -ne 0; then
+		{ { $as_echo "$as_me:$LINENO: error: You cannot define LINUX_FSNODE with windows support" >&5
+$as_echo "$as_me: error: You cannot define LINUX_FSNODE with windows support" >&2;}
+   { (exit 1); exit 1; }; };
+	fi
 	winfiles="os/imagezip/ntfs/GNUmakefile \
 		  os/imagezip/ntfs/liblocale/GNUmakefile \
 		  os/imagezip/ntfs/libntfs/GNUmakefile \
diff --git a/configure.in b/configure.in
index 284263031..5136331c3 100755
--- a/configure.in
+++ b/configure.in
@@ -131,6 +131,7 @@ AC_SUBST(TRACK_INTERSWITCH_BANDWIDTH)
 AC_SUBST(TIMESTAMPS)
 AC_SUBST(OURTIMEZONE)
 AC_SUBST(NODECONSOLE)
+AC_SUBST(MFSVERSION)
 AC_SUBST(UNIFIED_BOSS_AND_OPS)
 AC_SUBST(DISABLE_NSE)
 AC_SUBST(DISABLE_NAMED_SETUP)
@@ -239,6 +240,7 @@ AC_SUBST(OPSVM_ENABLE)
 AC_SUBST(OPSVM_MOUNTPOINT)
 AC_SUBST(PORTAL_ENABLE)
 AC_SUBST(PORTAL_ISPRIMARY)
+AC_SUBST(LINUX_FSNODE)
 
 #
 # Offer both versions of the email addresses that have the @ escaped
@@ -345,8 +347,10 @@ OPSVM_ENABLE=0
 OPSVM_MOUNTPOINT="/ops"
 OURTIMEZONE="America/Denver"
 NODECONSOLE="sio"
+MFSVERSION=""
 PORTAL_ENABLE=0
 PORTAL_ISPRIMARY=0
+LINUX_FSNODE=0
 
 #
 # XXX You really don't want to change these!
@@ -691,6 +695,8 @@ AC_ARG_WITH(apache-config-dir,
 [
     INSTALL_APACHE_CONFIG="$withval"
 ],[
+    foo=`httpd -V`
+    echo "httpd: '$foo'"
     foo=`httpd -V | grep SERVER_CONFIG_FILE | grep 'apache2'`
     if test "$foo" = ""; then
         INSTALL_APACHE_CONFIG="/usr/local/etc/apache"
@@ -801,6 +807,9 @@ fi
 if test $WINSUPPORT -eq 0; then
 	winfiles="";
 else
+	if test $LINUX_FSNODE -ne 0; then
+		AC_MSG_ERROR([You cannot define LINUX_FSNODE with windows support]);
+	fi
 	winfiles="os/imagezip/ntfs/GNUmakefile \
 		  os/imagezip/ntfs/liblocale/GNUmakefile \
 		  os/imagezip/ntfs/libntfs/GNUmakefile \
-- 
GitLab