Commit 53c11ab6 authored by Leigh Stoller's avatar Leigh Stoller

Change SFS from a --enable option to a defs file option.

parent ee65d2b0
...@@ -31,8 +31,6 @@ ac_help="$ac_help ...@@ -31,8 +31,6 @@ ac_help="$ac_help
--disable-events Disable events (requires Elvin libraries)" --disable-events Disable events (requires Elvin libraries)"
ac_help="$ac_help ac_help="$ac_help
--enable-windows Enable Windows XP support (requires third-party software)" --enable-windows Enable Windows XP support (requires third-party software)"
ac_help="$ac_help
--disable-sfs Disable SFS support (SFS must be installed on ops)"
ac_help="$ac_help ac_help="$ac_help
--enable-testmode Enable test mode --enable-testmode Enable test mode
--disable-testmode Disable test mode" --disable-testmode Disable test mode"
...@@ -586,7 +584,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } ...@@ -586,7 +584,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi fi
echo $ac_n "checking host system type""... $ac_c" 1>&6 echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:590: checking host system type" >&5 echo "configure:588: checking host system type" >&5
host_alias=$host host_alias=$host
case "$host_alias" in case "$host_alias" in
...@@ -607,7 +605,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ...@@ -607,7 +605,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6 echo "$ac_t""$host" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:611: checking build system type" >&5 echo "configure:609: checking build system type" >&5
build_alias=$build build_alias=$build
case "$build_alias" in case "$build_alias" in
...@@ -633,7 +631,7 @@ fi ...@@ -633,7 +631,7 @@ fi
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2 set dummy ${ac_tool_prefix}gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:637: checking for $ac_word" >&5 echo "configure:635: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -665,7 +663,7 @@ fi ...@@ -665,7 +663,7 @@ fi
# Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
set dummy ${ac_tool_prefix}g++; ac_word=$2 set dummy ${ac_tool_prefix}g++; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:669: checking for $ac_word" >&5 echo "configure:667: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -697,7 +695,7 @@ fi ...@@ -697,7 +695,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2 set dummy ${ac_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:701: checking for $ac_word" >&5 echo "configure:699: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -729,7 +727,7 @@ fi ...@@ -729,7 +727,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:733: checking for $ac_word" >&5 echo "configure:731: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -761,7 +759,7 @@ fi ...@@ -761,7 +759,7 @@ fi
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2 set dummy ${ac_tool_prefix}strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:765: checking for $ac_word" >&5 echo "configure:763: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -793,7 +791,7 @@ fi ...@@ -793,7 +791,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ssh", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ssh", so it can be a program name with args.
set dummy ${ac_tool_prefix}ssh; ac_word=$2 set dummy ${ac_tool_prefix}ssh; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:797: checking for $ac_word" >&5 echo "configure:795: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_SSH'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_SSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -864,6 +862,7 @@ fi ...@@ -864,6 +862,7 @@ fi
# #
...@@ -902,6 +901,7 @@ TBSECURECOOKIES=1 ...@@ -902,6 +901,7 @@ TBSECURECOOKIES=1
TBMAINSITE=0 TBMAINSITE=0
JAILIPBASE=172.17.0.0 JAILIPBASE=172.17.0.0
JAILIPMASK=255.240.0.0 JAILIPMASK=255.240.0.0
SFSSUPPORT=1
# #
# Okay, I know this is improper usage of --with. Too bad. # Okay, I know this is improper usage of --with. Too bad.
...@@ -1239,27 +1239,6 @@ else ...@@ -1239,27 +1239,6 @@ else
fi fi
#
# Disable SFS support if SFS is not installed on ops node.
#
# Check whether --enable-sfs or --disable-sfs was given.
if test "${enable_sfs+set}" = set; then
enableval="$enable_sfs"
:
fi
if test "$enable_sfs" = "no"; then
SFSSUPPORT=0;
else
SFSSUPPORT=1;
cat >> confdefs.h <<\EOF
#define SFSSUPPORT 1
EOF
fi
# #
# Testing mode. In testing mode scripts should not effect hardware state. # Testing mode. In testing mode scripts should not effect hardware state.
# This is designed to be used with the testsuite software which operates # This is designed to be used with the testsuite software which operates
...@@ -1294,7 +1273,7 @@ fi ...@@ -1294,7 +1273,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:1298: checking for a BSD compatible install" >&5 echo "configure:1277: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1622,6 +1601,7 @@ s%@TBCOOKIESUFFIX@%$TBCOOKIESUFFIX%g ...@@ -1622,6 +1601,7 @@ s%@TBCOOKIESUFFIX@%$TBCOOKIESUFFIX%g
s%@TBAUTHDOMAIN@%$TBAUTHDOMAIN%g s%@TBAUTHDOMAIN@%$TBAUTHDOMAIN%g
s%@TBAUTHTIMEOUT@%$TBAUTHTIMEOUT%g s%@TBAUTHTIMEOUT@%$TBAUTHTIMEOUT%g
s%@TBMAINSITE@%$TBMAINSITE%g s%@TBMAINSITE@%$TBMAINSITE%g
s%@SFSSUPPORT@%$SFSSUPPORT%g
s%@TBOPSEMAIL@%$TBOPSEMAIL%g s%@TBOPSEMAIL@%$TBOPSEMAIL%g
s%@TBOPSEMAIL_NOSLASH@%$TBOPSEMAIL_NOSLASH%g s%@TBOPSEMAIL_NOSLASH@%$TBOPSEMAIL_NOSLASH%g
s%@TBLOGSEMAIL@%$TBLOGSEMAIL%g s%@TBLOGSEMAIL@%$TBLOGSEMAIL%g
...@@ -1650,7 +1630,6 @@ s%@INSTALL_APACHE_CONFIG@%$INSTALL_APACHE_CONFIG%g ...@@ -1650,7 +1630,6 @@ s%@INSTALL_APACHE_CONFIG@%$INSTALL_APACHE_CONFIG%g
s%@OPT_CFLAGS@%$OPT_CFLAGS%g s%@OPT_CFLAGS@%$OPT_CFLAGS%g
s%@EVENTSYS@%$EVENTSYS%g s%@EVENTSYS@%$EVENTSYS%g
s%@WINSUPPORT@%$WINSUPPORT%g s%@WINSUPPORT@%$WINSUPPORT%g
s%@SFSSUPPORT@%$SFSSUPPORT%g
s%@TESTMODE@%$TESTMODE%g s%@TESTMODE@%$TESTMODE%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
......
...@@ -55,6 +55,7 @@ AC_SUBST(TBCOOKIESUFFIX) ...@@ -55,6 +55,7 @@ AC_SUBST(TBCOOKIESUFFIX)
AC_SUBST(TBAUTHDOMAIN) AC_SUBST(TBAUTHDOMAIN)
AC_SUBST(TBAUTHTIMEOUT) AC_SUBST(TBAUTHTIMEOUT)
AC_SUBST(TBMAINSITE) AC_SUBST(TBMAINSITE)
AC_SUBST(SFSSUPPORT)
# #
# Offer both versions of the email addresses that have the @ escaped # Offer both versions of the email addresses that have the @ escaped
...@@ -92,6 +93,7 @@ TBSECURECOOKIES=1 ...@@ -92,6 +93,7 @@ TBSECURECOOKIES=1
TBMAINSITE=0 TBMAINSITE=0
JAILIPBASE=172.17.0.0 JAILIPBASE=172.17.0.0
JAILIPMASK=255.240.0.0 JAILIPMASK=255.240.0.0
SFSSUPPORT=1
# #
# Okay, I know this is improper usage of --with. Too bad. # Okay, I know this is improper usage of --with. Too bad.
...@@ -349,20 +351,6 @@ else ...@@ -349,20 +351,6 @@ else
fi fi
AC_SUBST(WINSUPPORT) AC_SUBST(WINSUPPORT)
#
# Disable SFS support if SFS is not installed on ops node.
#
AC_ARG_ENABLE(sfs,
[ --disable-sfs Disable SFS support (SFS must be installed on ops)])
if test "$enable_sfs" = "no"; then
SFSSUPPORT=0;
else
SFSSUPPORT=1;
AC_DEFINE(SFSSUPPORT)
fi
AC_SUBST(SFSSUPPORT)
# #
# Testing mode. In testing mode scripts should not effect hardware state. # Testing mode. In testing mode scripts should not effect hardware state.
# This is designed to be used with the testsuite software which operates # This is designed to be used with the testsuite software which operates
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment