Commit 52fca4ba authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

configure: Shell cleanup



- Remote unnecessary quote characters
- Change some uses of “test "$foo"” to “test -n "$foo"”
- Merge “if/else/if” into “if/elif”
- Wrap lines longer than 80 characters and add a test to “make check”
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent e4d745a7
...@@ -1454,6 +1454,9 @@ check-local: check-dirs $(GENERATED_FILES) ...@@ -1454,6 +1454,9 @@ check-local: check-dirs $(GENERATED_FILES)
if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \ if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \
echo "File $(top_srcdir)/doc/design-$$expver.rst not found"; \ echo "File $(top_srcdir)/doc/design-$$expver.rst not found"; \
exit 1; \ exit 1; \
fi; \
if test $$(wc --max-line-length < $(top_srcdir)/configure.ac) -gt 80; then \
echo 'Longest line in configure.ac is longer than 80 characters' >&2; \
fi fi
.PHONY: hs-check .PHONY: hs-check
......
...@@ -104,7 +104,7 @@ AC_ARG_WITH([xen-cmd], ...@@ -104,7 +104,7 @@ AC_ARG_WITH([xen-cmd],
[Sets the xen cli interface command (default is xm)] [Sets the xen cli interface command (default is xm)]
)], )],
[xen_cmd="$withval"], [xen_cmd="$withval"],
[xen_cmd="xm"]) [xen_cmd=xm])
AC_SUBST(XEN_CMD, $xen_cmd) AC_SUBST(XEN_CMD, $xen_cmd)
if ! test "$XEN_CMD" = xl -o "$XEN_CMD" = xm; then if ! test "$XEN_CMD" = xl -o "$XEN_CMD" = xm; then
...@@ -134,7 +134,7 @@ AC_ARG_WITH([file-storage-dir], ...@@ -134,7 +134,7 @@ AC_ARG_WITH([file-storage-dir],
fi fi
]], ]],
[[file_storage_dir="/srv/ganeti/file-storage"; [[file_storage_dir="/srv/ganeti/file-storage";
enable_file_storage="True"]]) enable_file_storage=True]])
AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir) AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir)
AC_SUBST(ENABLE_FILE_STORAGE, $enable_file_storage) AC_SUBST(ENABLE_FILE_STORAGE, $enable_file_storage)
...@@ -152,7 +152,7 @@ AC_ARG_WITH([shared-file-storage-dir], ...@@ -152,7 +152,7 @@ AC_ARG_WITH([shared-file-storage-dir],
fi fi
]], ]],
[[shared_file_storage_dir="/srv/ganeti/shared-file-storage"; [[shared_file_storage_dir="/srv/ganeti/shared-file-storage";
enable_shared_file_storage="True"]]) enable_shared_file_storage=True]])
AC_SUBST(SHARED_FILE_STORAGE_DIR, $shared_file_storage_dir) AC_SUBST(SHARED_FILE_STORAGE_DIR, $shared_file_storage_dir)
AC_SUBST(ENABLE_SHARED_FILE_STORAGE, $enable_shared_file_storage) AC_SUBST(ENABLE_SHARED_FILE_STORAGE, $enable_shared_file_storage)
...@@ -173,7 +173,7 @@ AC_ARG_WITH([lvm-stripecount], ...@@ -173,7 +173,7 @@ AC_ARG_WITH([lvm-stripecount],
[ (default is 1)] [ (default is 1)]
)], )],
[lvm_stripecount="$withval"], [lvm_stripecount="$withval"],
[lvm_stripecount="1"]) [lvm_stripecount=1])
AC_SUBST(LVM_STRIPECOUNT, $lvm_stripecount) AC_SUBST(LVM_STRIPECOUNT, $lvm_stripecount)
# --with-ssh-login-user=... # --with-ssh-login-user=...
...@@ -268,7 +268,8 @@ AC_MSG_NOTICE([Group for clients is $group_admin]) ...@@ -268,7 +268,8 @@ AC_MSG_NOTICE([Group for clients is $group_admin])
# --enable-drbd-barriers # --enable-drbd-barriers
AC_ARG_ENABLE([drbd-barriers], AC_ARG_ENABLE([drbd-barriers],
[AS_HELP_STRING([--enable-drbd-barriers], [AS_HELP_STRING([--enable-drbd-barriers],
[enable by default the DRBD barriers functionality (>= 8.0.12) (default: enabled)])], m4_normalize([enable the DRBD barriers functionality by
default (>= 8.0.12) (default: enabled)]))],
[[if test "$enableval" != no; then [[if test "$enableval" != no; then
DRBD_BARRIERS=n DRBD_BARRIERS=n
DRBD_NO_META_FLUSH=False DRBD_NO_META_FLUSH=False
...@@ -444,10 +445,10 @@ if test -z "$GHC"; then ...@@ -444,10 +445,10 @@ if test -z "$GHC"; then
fi fi
AC_MSG_CHECKING([checking for extra GHC flags]) AC_MSG_CHECKING([checking for extra GHC flags])
GHC_BYVERSION_FLAGS="" GHC_BYVERSION_FLAGS=
# check for GHC supported flags that vary accross versions # check for GHC supported flags that vary accross versions
for flag in -fwarn-incomplete-uni-patterns; do for flag in -fwarn-incomplete-uni-patterns; do
if $GHC -e "0" $flag >/dev/null 2>/dev/null; then if $GHC -e '0' $flag >/dev/null 2>/dev/null; then
GHC_BYVERSION_FLAGS="$GHC_BYVERSION_FLAGS $flag" GHC_BYVERSION_FLAGS="$GHC_BYVERSION_FLAGS $flag"
fi fi
done done
...@@ -464,10 +465,10 @@ fi ...@@ -464,10 +465,10 @@ fi
# check for modules, first custom/special checks # check for modules, first custom/special checks
AC_MSG_NOTICE([checking for required haskell modules]) AC_MSG_NOTICE([checking for required haskell modules])
HTOOLS_NOCURL=-DNO_CURL HTOOLS_NOCURL=-DNO_CURL
if test "$enable_htools_rapi" != "no"; then if test "$enable_htools_rapi" != no; then
AC_GHC_PKG_CHECK([curl], [HTOOLS_NOCURL=], []) AC_GHC_PKG_CHECK([curl], [HTOOLS_NOCURL=], [])
if test -n "$HTOOLS_NOCURL"; then if test -n "$HTOOLS_NOCURL"; then
if test "$enable_htools_rapi" = "check"; then if test "$enable_htools_rapi" = check; then
AC_MSG_WARN(m4_normalize([The curl library was not found, Haskell AC_MSG_WARN(m4_normalize([The curl library was not found, Haskell
code will be compiled without RAPI support])) code will be compiled without RAPI support]))
else else
...@@ -495,7 +496,7 @@ AC_GHC_PKG_REQUIRE(utf8-string) ...@@ -495,7 +496,7 @@ AC_GHC_PKG_REQUIRE(utf8-string)
# extra modules for confd functionality # extra modules for confd functionality
HTOOLS_REGEX_PCRE=-DNO_REGEX_PCRE HTOOLS_REGEX_PCRE=-DNO_REGEX_PCRE
has_confd=False has_confd=False
if test "$enable_confd" != "no"; then if test "$enable_confd" != no; then
CONFD_PKG= CONFD_PKG=
AC_GHC_PKG_CHECK([regex-pcre], [HTOOLS_REGEX_PCRE=], AC_GHC_PKG_CHECK([regex-pcre], [HTOOLS_REGEX_PCRE=],
[CONFD_PKG="$CONFD_PKG regex-pcre"]) [CONFD_PKG="$CONFD_PKG regex-pcre"])
...@@ -505,19 +506,17 @@ if test "$enable_confd" != "no"; then ...@@ -505,19 +506,17 @@ if test "$enable_confd" != "no"; then
AC_GHC_PKG_CHECK([hinotify], [], [CONFD_PKG="$CONFD_PKG hinotify"]) AC_GHC_PKG_CHECK([hinotify], [], [CONFD_PKG="$CONFD_PKG hinotify"])
if test -z "$CONFD_PKG"; then if test -z "$CONFD_PKG"; then
has_confd=True has_confd=True
elif test "$enable_confd" = check; then
AC_MSG_WARN(m4_normalize([The required extra libraries for confd were
not found ($CONFD_PKG), confd disabled]))
else else
if test "$enable_confd" = "check"; then AC_MSG_FAILURE(m4_normalize([The confd functionality was requested, but
AC_MSG_WARN(m4_normalize([The required extra libraries for confd were required libraries were not found:
not found ($CONFD_PKG), confd disabled])) $CONFD_PKG]))
else
AC_MSG_FAILURE(m4_normalize([The confd functionality was requested, but
required libraries were not found:
$CONFD_PKG]))
fi
fi fi
fi fi
AC_SUBST(HTOOLS_REGEX_PCRE) AC_SUBST(HTOOLS_REGEX_PCRE)
if test "$has_confd" = "True"; then if test "$has_confd" = True; then
AC_MSG_NOTICE([Enabling confd usage]) AC_MSG_NOTICE([Enabling confd usage])
fi fi
AC_SUBST(ENABLE_CONFD, $has_confd) AC_SUBST(ENABLE_CONFD, $has_confd)
...@@ -525,28 +524,27 @@ AM_CONDITIONAL([ENABLE_CONFD], [test x$has_confd = xTrue]) ...@@ -525,28 +524,27 @@ AM_CONDITIONAL([ENABLE_CONFD], [test x$has_confd = xTrue])
#extra modules for monitoring agent functionality #extra modules for monitoring agent functionality
has_monitoring=False has_monitoring=False
if test "$enable_monitoring" != "no"; then if test "$enable_monitoring" != no; then
MONITORING_PKG= MONITORING_PKG=
AC_GHC_PKG_CHECK([attoparsec], [], [MONITORING_PKG="$MONITORING_PKG attoparsec"]) AC_GHC_PKG_CHECK([attoparsec], [],
[MONITORING_PKG="$MONITORING_PKG attoparsec"])
if test -z "$MONITORING_PKG"; then if test -z "$MONITORING_PKG"; then
has_monitoring=True has_monitoring=True
elif test "$enable_monitoring" = check; then
AC_MSG_WARN(m4_normalize([The required extra libraries for the monitoring
agent were not found ($MONITORING_PKG),
monitoring disabled]))
else else
if test "$enable_monitoring" = "check"; then AC_MSG_FAILURE(m4_normalize([The monitoring functionality was requested, but
AC_MSG_WARN(m4_normalize([The required extra libraries for the monitoring required libraries were not found:
agent were not found ($MONITORING_PKG), $MONITORING_PKG]))
monitoring disabled]))
else
AC_MSG_FAILURE(m4_normalize([The monitoring functionality was requested, but
required libraries were not found:
$MONITORING_PKG]))
fi
fi fi
fi fi
if test "$has_monitoring" = "True"; then if test "$has_monitoring" = True; then
AC_MSG_NOTICE([Enabling the monitoring agent usage]) AC_MSG_NOTICE([Enabling the monitoring agent usage])
fi fi
AC_SUBST(ENABLE_MONITORING, $has_monitoring) AC_SUBST(ENABLE_MONITORING, $has_monitoring)
AM_CONDITIONAL([ENABLE_MONITORING], [test x$has_monitoring = xTrue]) AM_CONDITIONAL([ENABLE_MONITORING], [test "$has_monitoring" = True])
# development modules # development modules
HTOOLS_NODEV= HTOOLS_NODEV=
...@@ -625,7 +623,7 @@ if test -z "$HADDOCK"; then ...@@ -625,7 +623,7 @@ if test -z "$HADDOCK"; then
AC_MSG_WARN(m4_normalize([haddock not found, htools API documentation will AC_MSG_WARN(m4_normalize([haddock not found, htools API documentation will
not be generated])) not be generated]))
fi fi
if test "$HADDOCK" && test "$HSCOLOUR"; then if test -n "$HADDOCK" && test -n "$HSCOLOUR"; then
HTOOLS_APIDOC=yes HTOOLS_APIDOC=yes
fi fi
AC_SUBST(HTOOLS_APIDOC) AC_SUBST(HTOOLS_APIDOC)
...@@ -638,14 +636,14 @@ if test -z "$HLINT"; then ...@@ -638,14 +636,14 @@ if test -z "$HLINT"; then
AC_MSG_WARN([hlint not found, checking code will not be possible]) AC_MSG_WARN([hlint not found, checking code will not be possible])
fi fi
if test "$HTOOLS" != "yes" && test "$ENABLE_CONFD" = "True"; then if test "$HTOOLS" != yes && test "$ENABLE_CONFD" = True; then
AC_MSG_ERROR(m4_normalize([cannot enable ganeti-confd if AC_MSG_ERROR(m4_normalize([cannot enable ganeti-confd if
htools support is not enabled])) htools support is not enabled]))
fi fi
AM_CONDITIONAL([WANT_HTOOLS], [test x$HTOOLS = xyes]) AM_CONDITIONAL([WANT_HTOOLS], [test "$HTOOLS" = yes])
AM_CONDITIONAL([WANT_HTOOLSTESTS], [test "x$HTOOLS_NODEV" = x]) AM_CONDITIONAL([WANT_HTOOLSTESTS], [test "x$HTOOLS_NODEV" = x])
AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test x$HTOOLS_APIDOC = xyes]) AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test "$HTOOLS_APIDOC" = yes])
AM_CONDITIONAL([HAS_HLINT], [test "$HLINT"]) AM_CONDITIONAL([HAS_HLINT], [test "$HLINT"])
# Check for fakeroot # Check for fakeroot
......
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