Commit 5cdffff9 authored by Leigh Stoller's avatar Leigh Stoller

Deprecate --enable-windows to configure and replace with WINSUPPORT=0/1

in the defs file, so that it is easier to export a default value.
The local defs-default turns it on for all of us, while the default in
configure.in is off. It is currently off by default in defs-example.

I have left the --enable-windows and --disable-windows arguments for
backwards compatability; they just override whatever the defs file
says but otherwise have no effect if not specified.
parent 998a2d1e
...@@ -1362,6 +1362,7 @@ done ...@@ -1362,6 +1362,7 @@ done
# #
...@@ -1411,6 +1412,7 @@ PLABSUPPORT=0 ...@@ -1411,6 +1412,7 @@ PLABSUPPORT=0
PLAB_ROOTBALL="change.me" PLAB_ROOTBALL="change.me"
PLAB_SLICEPREFIX="utah_elab" PLAB_SLICEPREFIX="utah_elab"
WIKISUPPORT=0 WIKISUPPORT=0
WINSUPPORT=0
TBLOGFACIL="local5" TBLOGFACIL="local5"
LINKTEST_NSPATH="/share/linktest-ns" LINKTEST_NSPATH="/share/linktest-ns"
BOSSEVENTPORT=2927 BOSSEVENTPORT=2927
...@@ -1880,7 +1882,6 @@ fi ...@@ -1880,7 +1882,6 @@ fi
# Enable Windows support. # Enable Windows support.
# Right now this means NTFS support in imagezip, maybe more things later. # Right now this means NTFS support in imagezip, maybe more things later.
# Relies on Linux NTFS library. # Relies on Linux NTFS library.
# Off by default.
# #
# Check whether --enable-windows or --disable-windows was given. # Check whether --enable-windows or --disable-windows was given.
if test "${enable_windows+set}" = set; then if test "${enable_windows+set}" = set; then
...@@ -1890,15 +1891,19 @@ fi ...@@ -1890,15 +1891,19 @@ fi
if test "$enable_windows" = "no"; then if test "$enable_windows" = "no"; then
winfiles="";
WINSUPPORT=0; WINSUPPORT=0;
elif test "$enable_windows" = "yes"; then
WINSUPPORT=1;
fi
if test $WINSUPPORT -eq 0; then
winfiles="";
else else
winfiles="os/imagezip/ntfs/GNUmakefile \ winfiles="os/imagezip/ntfs/GNUmakefile \
os/imagezip/ntfs/liblocale/GNUmakefile \ os/imagezip/ntfs/liblocale/GNUmakefile \
os/imagezip/ntfs/libntfs/GNUmakefile \ os/imagezip/ntfs/libntfs/GNUmakefile \
os/imagezip/fat/GNUmakefile" os/imagezip/fat/GNUmakefile"
optional_subdirs="$optional_subdirs"; optional_subdirs="$optional_subdirs";
WINSUPPORT=1;
fi fi
...@@ -1910,17 +1915,17 @@ for ac_hdr in ulxmlrpcpp/ulxr_config.h ...@@ -1910,17 +1915,17 @@ for ac_hdr in ulxmlrpcpp/ulxr_config.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1914: checking for $ac_hdr" >&5 echo "configure:1919: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1919 "configure" #line 1924 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -1959,17 +1964,17 @@ for ac_hdr in linux/videodev.h ...@@ -1959,17 +1964,17 @@ for ac_hdr in linux/videodev.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1963: checking for $ac_hdr" >&5 echo "configure:1968: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1968 "configure" #line 1973 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2002,7 +2007,7 @@ done ...@@ -2002,7 +2007,7 @@ done
# Extract the first word of "gtk-config", so it can be a program name with args. # Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2 set dummy gtk-config; 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:2006: checking for $ac_word" >&5 echo "configure:2011: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2081,7 +2086,7 @@ fi ...@@ -2081,7 +2086,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:2085: checking for a BSD compatible install" >&5 echo "configure:2090: 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
...@@ -2142,7 +2147,7 @@ esac ...@@ -2142,7 +2147,7 @@ esac
# Extract the first word of "rsync", so it can be a program name with args. # Extract the first word of "rsync", so it can be a program name with args.
set dummy rsync; ac_word=$2 set dummy rsync; 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:2146: checking for $ac_word" >&5 echo "configure:2151: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RSYNC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_RSYNC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2571,6 +2576,7 @@ s%@SSLCERT_LOCALITY@%$SSLCERT_LOCALITY%g ...@@ -2571,6 +2576,7 @@ s%@SSLCERT_LOCALITY@%$SSLCERT_LOCALITY%g
s%@SSLCERT_ORGNAME@%$SSLCERT_ORGNAME%g s%@SSLCERT_ORGNAME@%$SSLCERT_ORGNAME%g
s%@FRISEBEEMCASTADDR@%$FRISEBEEMCASTADDR%g s%@FRISEBEEMCASTADDR@%$FRISEBEEMCASTADDR%g
s%@FRISEBEEMCASTPORT@%$FRISEBEEMCASTPORT%g s%@FRISEBEEMCASTPORT@%$FRISEBEEMCASTPORT%g
s%@WINSUPPORT@%$WINSUPPORT%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
...@@ -2600,7 +2606,6 @@ s%@INSTALL_APACHE_CONFIG@%$INSTALL_APACHE_CONFIG%g ...@@ -2600,7 +2606,6 @@ s%@INSTALL_APACHE_CONFIG@%$INSTALL_APACHE_CONFIG%g
s%@BRAINSTEM_DIR@%$BRAINSTEM_DIR%g s%@BRAINSTEM_DIR@%$BRAINSTEM_DIR%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%@HAVE_ULXMLRPCPP@%$HAVE_ULXMLRPCPP%g s%@HAVE_ULXMLRPCPP@%$HAVE_ULXMLRPCPP%g
s%@GTK_CONFIG@%$GTK_CONFIG%g s%@GTK_CONFIG@%$GTK_CONFIG%g
s%@HAVE_MEZZANINE@%$HAVE_MEZZANINE%g s%@HAVE_MEZZANINE@%$HAVE_MEZZANINE%g
......
...@@ -144,6 +144,7 @@ AC_SUBST(SSLCERT_LOCALITY) ...@@ -144,6 +144,7 @@ AC_SUBST(SSLCERT_LOCALITY)
AC_SUBST(SSLCERT_ORGNAME) AC_SUBST(SSLCERT_ORGNAME)
AC_SUBST(FRISEBEEMCASTADDR) AC_SUBST(FRISEBEEMCASTADDR)
AC_SUBST(FRISEBEEMCASTPORT) AC_SUBST(FRISEBEEMCASTPORT)
AC_SUBST(WINSUPPORT)
# #
# Offer both versions of the email addresses that have the @ escaped # Offer both versions of the email addresses that have the @ escaped
...@@ -192,6 +193,7 @@ PLABSUPPORT=0 ...@@ -192,6 +193,7 @@ PLABSUPPORT=0
PLAB_ROOTBALL="change.me" PLAB_ROOTBALL="change.me"
PLAB_SLICEPREFIX="utah_elab" PLAB_SLICEPREFIX="utah_elab"
WIKISUPPORT=0 WIKISUPPORT=0
WINSUPPORT=0
TBLOGFACIL="local5" TBLOGFACIL="local5"
LINKTEST_NSPATH="/share/linktest-ns" LINKTEST_NSPATH="/share/linktest-ns"
BOSSEVENTPORT=2927 BOSSEVENTPORT=2927
...@@ -543,23 +545,26 @@ AC_SUBST(EVENTSYS) ...@@ -543,23 +545,26 @@ AC_SUBST(EVENTSYS)
# Enable Windows support. # Enable Windows support.
# Right now this means NTFS support in imagezip, maybe more things later. # Right now this means NTFS support in imagezip, maybe more things later.
# Relies on Linux NTFS library. # Relies on Linux NTFS library.
# Off by default.
# #
AC_ARG_ENABLE(windows, AC_ARG_ENABLE(windows,
[ --enable-windows Enable Windows XP support (default)]) [ --enable-windows Enable Windows XP support (default)])
if test "$enable_windows" = "no"; then if test "$enable_windows" = "no"; then
winfiles="";
WINSUPPORT=0; WINSUPPORT=0;
elif test "$enable_windows" = "yes"; then
WINSUPPORT=1;
fi
if test $WINSUPPORT -eq 0; then
winfiles="";
else else
winfiles="os/imagezip/ntfs/GNUmakefile \ winfiles="os/imagezip/ntfs/GNUmakefile \
os/imagezip/ntfs/liblocale/GNUmakefile \ os/imagezip/ntfs/liblocale/GNUmakefile \
os/imagezip/ntfs/libntfs/GNUmakefile \ os/imagezip/ntfs/libntfs/GNUmakefile \
os/imagezip/fat/GNUmakefile" os/imagezip/fat/GNUmakefile"
optional_subdirs="$optional_subdirs"; optional_subdirs="$optional_subdirs";
WINSUPPORT=1;
fi fi
AC_SUBST(WINSUPPORT)
# #
# Check for ulsshxmlrpc header # Check for ulsshxmlrpc header
......
...@@ -35,6 +35,7 @@ THISHOMEBASE=Emulab.Net ...@@ -35,6 +35,7 @@ THISHOMEBASE=Emulab.Net
PLABSUPPORT=1 PLABSUPPORT=1
PLAB_ROOTBALL="plabroot-10.tar.bz2" PLAB_ROOTBALL="plabroot-10.tar.bz2"
WIKISUPPORT=1 WIKISUPPORT=1
WINSUPPORT=1
# #
# SSL Certificate stuff. Used to customize config files in ssl directory. # SSL Certificate stuff. Used to customize config files in ssl directory.
# Note that OrganizationalUnit is set in the cnf file. # Note that OrganizationalUnit is set in the cnf file.
......
...@@ -172,6 +172,7 @@ SFSSUPPORT=0 ...@@ -172,6 +172,7 @@ SFSSUPPORT=0
DISABLE_NSE=1 DISABLE_NSE=1
FRISEBEEMCASTADDR="234.5.6" FRISEBEEMCASTADDR="234.5.6"
FRISEBEEMCASTPORT=3564 FRISEBEEMCASTPORT=3564
WINSUPPORT=0
# Sometimes the main page is down in a directory on WWWHOST # Sometimes the main page is down in a directory on WWWHOST
# No trailing '/'! # No trailing '/'!
......
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