X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/6c60b266dc08f32146ee8dbb3ea9a86f72de5fcb..410945f11aee035aabc8cc4389f72098341e075c:/configure.ac diff --git a/configure.ac b/configure.ac index 54166dc..80344e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ # Configure script for Ganeti m4_define([gnt_version_major], [2]) -m4_define([gnt_version_minor], [9]) +m4_define([gnt_version_minor], [10]) m4_define([gnt_version_revision], [0]) -m4_define([gnt_version_suffix], [~beta1]) +m4_define([gnt_version_suffix], [~rc1]) m4_define([gnt_version_full], m4_format([%d.%d.%d%s], gnt_version_major, gnt_version_minor, @@ -20,6 +20,42 @@ AC_SUBST([VERSION_REVISION], gnt_version_revision) AC_SUBST([VERSION_SUFFIX], gnt_version_suffix) AC_SUBST([VERSION_FULL], gnt_version_full) +AC_SUBST([BINDIR], $bindir) +AC_SUBST([SBINDIR], $sbindir) +AC_SUBST([MANDIR], $mandir) + +# --enable-versionfull +AC_ARG_ENABLE([versionfull], + [AS_HELP_STRING([--enable-versionfull], + m4_normalize([use the full version string rather + than major.minor for version directories]))], + [[if test "$enableval" != no; then + USE_VERSION_FULL=yes + else + USER_VERSION_FULL=no + fi + ]], + [USE_VERSION_FULL=no + ]) +AC_SUBST(USE_VERSION_FULL, $USE_VERSION_FULL) +AM_CONDITIONAL([USE_VERSION_FULL], [test "$USE_VERSION_FULL" = yes]) + +# --enable-symlinks +AC_ARG_ENABLE([symlinks], + [AS_HELP_STRING([--enable-symlinks], + m4_normalize([also install version-dependent symlinks under + $sysconfdir (default: enabled)]))], + [[if test "$enableval" != no; then + INSTALL_SYMLINKS=yes + else + INSTALL_SYMLINKS=no + fi + ]], + [INSTALL_SYMLINKS=yes + ]) +AC_SUBST(INSTALL_SYMLINKS, $INSTALL_SYMLINKS) +AM_CONDITIONAL([INSTALL_SYMLINKS], [test "$INSTALL_SYMLINKS" = yes]) + # --with-ssh-initscript=... AC_ARG_WITH([ssh-initscript], [AS_HELP_STRING([--with-ssh-initscript=SCRIPT], @@ -59,37 +95,34 @@ AC_ARG_WITH([xen-config-dir], AC_SUBST(XEN_CONFIG_DIR, $xen_config_dir) # --with-os-search-path=... -# do a bit of black sed magic to for quoting of the strings in the list AC_ARG_WITH([os-search-path], [AS_HELP_STRING([--with-os-search-path=LIST], [comma separated list of directories to] [ search for OS images (default is /srv/ganeti/os)] )], - [os_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/'\1'/g"`], - [os_search_path="'/srv/ganeti/os'"]) + [os_search_path="$withval"], + [os_search_path="/srv/ganeti/os"]) AC_SUBST(OS_SEARCH_PATH, $os_search_path) # --with-extstorage-search-path=... -# same black sed magic for quoting of the strings in the list AC_ARG_WITH([extstorage-search-path], [AS_HELP_STRING([--with-extstorage-search-path=LIST], [comma separated list of directories to] [ search for External Storage Providers] [ (default is /srv/ganeti/extstorage)] )], - [es_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/'\1'/g"`], - [es_search_path="'/srv/ganeti/extstorage'"]) + [es_search_path="$withval"], + [es_search_path="/srv/ganeti/extstorage"]) AC_SUBST(ES_SEARCH_PATH, $es_search_path) # --with-iallocator-search-path=... -# do a bit of black sed magic to for quoting of the strings in the list AC_ARG_WITH([iallocator-search-path], [AS_HELP_STRING([--with-iallocator-search-path=LIST], [comma separated list of directories to] [ search for instance allocators (default is $libdir/ganeti/iallocators)] )], - [iallocator_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/'\1'/g"`], - [iallocator_search_path="'$libdir/$PACKAGE_NAME/iallocators'"]) + [iallocator_search_path="$withval"], + [iallocator_search_path="$libdir/$PACKAGE_NAME/iallocators"]) AC_SUBST(IALLOCATOR_SEARCH_PATH, $iallocator_search_path) # --with-xen-bootloader=... @@ -128,15 +161,6 @@ AC_ARG_WITH([kvm-kernel], [kvm_kernel="/boot/vmlinuz-3-kvmU"]) AC_SUBST(KVM_KERNEL, $kvm_kernel) -# --with-shared-file-storage-dir=... -AC_ARG_WITH([shared-file-storage-dir], - [AS_HELP_STRING([--with-shared-file-storage-dir=PATH], - [directory to store files for shared file-based backend] - [ (default is /srv/ganeti/shared-file-storage)] - )], - [[shared_file_storage_dir="/srv/ganeti/shared-file-storage"]]) -AC_SUBST(SHARED_FILE_STORAGE_DIR, $shared_file_storage_dir) - # --with-kvm-path=... AC_ARG_WITH([kvm-path], [AS_HELP_STRING([--with-kvm-path=PATH], @@ -305,6 +329,7 @@ then fi AC_SUBST(SYSLOG_USAGE, $SYSLOG) +# --enable-restricted-commands[=no/yes] AC_ARG_ENABLE([restricted-commands], [AS_HELP_STRING([--enable-restricted-commands], m4_normalize([enable restricted commands in the node daemon @@ -332,6 +357,14 @@ AC_SUBST(DISK_SEPARATOR, $disk_separator) AC_PROG_INSTALL AC_PROG_LN_S +# check if ln is the GNU version of ln (and hence supports -T) +if ln --version 2> /dev/null | head -1 | grep -q GNU +then + AC_SUBST(HAS_GNU_LN, True) +else + AC_SUBST(HAS_GNU_LN, False) +fi + # Check for the ip command AC_ARG_VAR(IP_PATH, [ip path]) AC_PATH_PROG(IP_PATH, [ip], []) @@ -364,7 +397,8 @@ else # Note: Character classes ([...]) need to be double quoted due to autoconf # using m4 - elif ! echo "$sphinxver" | grep -q -E '^Sphinx[[[:space:]]]+v[[1-9]]\>'; then + elif ! echo "$sphinxver" | grep -q -E \ + '^Sphinx[[[:space:]]]+(\(sphinx-build\)[[[:space:]]]+|v)[[1-9]]\>'; then AC_MSG_ERROR([Sphinx 1.0 or higher is required]) fi fi @@ -585,8 +619,12 @@ AC_GHC_PKG_CHECK([temporary], [], [HS_NODEV=1]) # of the checks. AC_GHC_PKG_CHECK([attoparsec], [], [HS_NODEV=1]) AC_GHC_PKG_CHECK([vector], [], [HS_NODEV=1]) -AC_GHC_PKG_CHECK([process], [], - [MONITORING_PKG="$MONITORING_PKG process"]) +AC_GHC_PKG_CHECK([process], [], [HS_NODEV=1]) +AC_GHC_PKG_CHECK([snap-server], [], [HS_NODEV=1]) +AC_GHC_PKG_CHECK([regex-pcre], [], [HS_NODEV=1]) +AC_GHC_PKG_CHECK([Crypto], [], [HS_NODEV=1]) +AC_GHC_PKG_CHECK([text], [], [HS_NODEV=1]) +AC_GHC_PKG_CHECK([hinotify], [], [HS_NODEV=1]) if test -n "$HS_NODEV"; then AC_MSG_WARN(m4_normalize([Required development modules were not found, you won't be able to run Haskell unittests]))