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

Fix ordering enable-windows argument and inclusion of the defs

file so that command line arguments overrides, as it does for
other options.
parent 92dfa2ab
......@@ -4191,31 +4191,6 @@ _ACEOF
OUTERBOSS_NODENAME=""
WINSUPPORT=0
# Check whether --enable-windows was given.
if test "${enable_windows+set}" = set; then
enableval=$enable_windows;
fi
if test "$enable_windows" = "no"; then
WINSUPPORT=0;
elif test "$enable_windows" = "yes"; then
WINSUPPORT=1;
fi
if test $WINSUPPORT -eq 0; then
winfiles="";
else
winfiles="os/imagezip/ntfs/GNUmakefile \
os/imagezip/ntfs/liblocale/GNUmakefile \
os/imagezip/ntfs/libntfs/GNUmakefile \
os/imagezip/fat/GNUmakefile"
cat >>confdefs.h <<_ACEOF
#define WINSUPPORT 1
_ACEOF
fi
#
# Allow tbdefs file that is supplied to full emulab build
#
......@@ -4248,6 +4223,31 @@ $as_echo "$as_me: error: Definitions file $TBDEFS was not found." >&2;}
fi
# Check whether --enable-windows was given.
if test "${enable_windows+set}" = set; then
enableval=$enable_windows;
fi
if test "$enable_windows" = "no"; then
WINSUPPORT=0;
elif test "$enable_windows" = "yes"; then
WINSUPPORT=1;
fi
if test $WINSUPPORT -eq 0; then
winfiles="";
else
winfiles="os/imagezip/ntfs/GNUmakefile \
os/imagezip/ntfs/liblocale/GNUmakefile \
os/imagezip/ntfs/libntfs/GNUmakefile \
os/imagezip/fat/GNUmakefile"
cat >>confdefs.h <<_ACEOF
#define WINSUPPORT 1
_ACEOF
fi
#
# Allow command line option, since might not have a defs file.
#
......@@ -4916,7 +4916,6 @@ outfiles="Makeconf GNUmakefile \
tmcc/freebsd/supfile tmcc/freebsd/sethostname \
tmcc/linux/GNUmakefile tmcc/linux/supfile \
tmcc/linux/sethostname.dhclient \
tmcc/linux/xen/emulab-cnet \
tmcc/linux9/GNUmakefile tmcc/linux9/supfile \
tmcc/fedora/GNUmakefile tmcc/fedora/supfile \
tmcc/fedora15/GNUmakefile \
......
......@@ -122,25 +122,6 @@ AC_SUBST(WINSUPPORT)
OUTERBOSS_NODENAME=""
WINSUPPORT=0
AC_ARG_ENABLE(windows,
[ --enable-windows[[=yes/no]] Enable Windows FAT/NTFS support in imagezip [[default=no]]])
if test "$enable_windows" = "no"; then
WINSUPPORT=0;
elif test "$enable_windows" = "yes"; then
WINSUPPORT=1;
fi
if test $WINSUPPORT -eq 0; then
winfiles="";
else
winfiles="os/imagezip/ntfs/GNUmakefile \
os/imagezip/ntfs/liblocale/GNUmakefile \
os/imagezip/ntfs/libntfs/GNUmakefile \
os/imagezip/fat/GNUmakefile"
AC_DEFINE_UNQUOTED(WINSUPPORT, 1)
fi
#
# Allow tbdefs file that is supplied to full emulab build
#
......@@ -166,6 +147,25 @@ AC_ARG_WITH(TBDEFS,
fi
])
AC_ARG_ENABLE(windows,
[ --enable-windows[[=yes/no]] Enable Windows FAT/NTFS support in imagezip [[default=no]]])
if test "$enable_windows" = "no"; then
WINSUPPORT=0;
elif test "$enable_windows" = "yes"; then
WINSUPPORT=1;
fi
if test $WINSUPPORT -eq 0; then
winfiles="";
else
winfiles="os/imagezip/ntfs/GNUmakefile \
os/imagezip/ntfs/liblocale/GNUmakefile \
os/imagezip/ntfs/libntfs/GNUmakefile \
os/imagezip/fat/GNUmakefile"
AC_DEFINE_UNQUOTED(WINSUPPORT, 1)
fi
#
# Allow command line option, since might not have a defs file.
#
......@@ -245,7 +245,6 @@ outfiles="Makeconf GNUmakefile \
tmcc/freebsd/supfile tmcc/freebsd/sethostname \
tmcc/linux/GNUmakefile tmcc/linux/supfile \
tmcc/linux/sethostname.dhclient \
tmcc/linux/xen/emulab-cnet \
tmcc/linux9/GNUmakefile tmcc/linux9/supfile \
tmcc/fedora/GNUmakefile tmcc/fedora/supfile \
tmcc/fedora15/GNUmakefile \
......
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