diff options
| author | Richard Jones <rjones@redhat.com> | 2010-05-13 17:07:17 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-05-13 18:52:15 +0100 |
| commit | 8700a55d52f25f60f01ef1b67cff6d5c0071700b (patch) | |
| tree | da79dc6eb77fefa02bfe00325f7c975ca1ae9238 /configure.ac | |
| parent | 55748a94bc840ac07d3c211119372cd16b31f1a0 (diff) | |
| download | libguestfs-8700a55d52f25f60f01ef1b67cff6d5c0071700b.tar.gz libguestfs-8700a55d52f25f60f01ef1b67cff6d5c0071700b.tar.xz libguestfs-8700a55d52f25f60f01ef1b67cff6d5c0071700b.zip | |
Unify supermin appliance building using febootstrap 2.7
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 42 |
1 files changed, 4 insertions, 38 deletions
diff --git a/configure.ac b/configure.ac index 0eb83c01..d660738b 100644 --- a/configure.ac +++ b/configure.ac @@ -305,6 +305,10 @@ if test "x$enable_appliance" = "xyes"; then [febootstrap-to-initramfs],[febootstrap-to-initramfs],[no]) test "x$FEBOOTSTRAP_TO_INITRAMFS" = "xno" && \ AC_MSG_ERROR([febootstrap-to-initramfs must be installed]) + AC_CHECK_PROG([FEBOOTSTRAP_TO_SUPERMIN], + [febootstrap-to-supermin],[febootstrap-to-supermin],[no]) + test "x$FEBOOTSTRAP_TO_SUPERMIN" = "xno" && \ + AC_MSG_ERROR([febootstrap-to-supermin must be installed]) dnl Check we have fakechroot >= 2.9 (it's an indirect requirement dnl of febootstrap, but old versions will fail with yum). @@ -391,40 +395,6 @@ AC_ARG_ENABLE([supermin], [enable_supermin=no]) AM_CONDITIONAL([SUPERMIN],[test "x$enable_supermin" = "xyes"]) -if test "x$enable_supermin" = "xyes"; then - dnl Check febootstrap-to-initramfs accepts the --files option - dnl (febootstrap >= 2.2). - AC_MSG_CHECKING([for --files support in $FEBOOTSTRAP_TO_INITRAMFS]) - out=`$FEBOOTSTRAP_TO_INITRAMFS 2>&1 ||:` - echo "febootstrap_to_initramfs test command output: $out" >&AS_MESSAGE_LOG_FD - if ! echo "$out" | grep -sq -e --files ; then - AC_MSG_RESULT([no]) - AC_MSG_FAILURE( -[febootstrap-to-initramfs does not support the --files option. - -To build the supermin appliance, you need to upgrade to the latest -version of febootstrap. -]) - fi - AC_MSG_RESULT([yes]) - - dnl Check febootstrap-to-initramfs accepts the --nocompress option - dnl (febootstrap >= 2.3). - AC_MSG_CHECKING([for --nocompress support in $FEBOOTSTRAP_TO_INITRAMFS]) - out=`$FEBOOTSTRAP_TO_INITRAMFS 2>&1 ||:` - echo "febootstrap_to_initramfs test command output: $out" >&AS_MESSAGE_LOG_FD - if ! echo "$out" | grep -sq -e --nocompress ; then - AC_MSG_RESULT([no]) - AC_MSG_FAILURE( -[febootstrap-to-initramfs does not support the --nocompress option. - -To build the supermin appliance, you need to upgrade to the latest -version of febootstrap. -]) - fi - AC_MSG_RESULT([yes]) -fi - dnl Enable packet dumps when in verbose mode. This generates lots dnl of debug info, only useful for people debugging the RPC mechanism. AC_ARG_ENABLE([packet-dump], @@ -761,10 +731,6 @@ AC_CONFIG_HEADERS([config.h]) dnl http://www.mail-archive.com/automake@gnu.org/msg10204.html AC_CONFIG_FILES([appliance/update.sh], [chmod +x appliance/update.sh]) -AC_CONFIG_FILES([appliance/supermin-split.sh], - [chmod +x appliance/supermin-split.sh]) -AC_CONFIG_FILES([appliance/supermin-make.sh], - [chmod +x appliance/supermin-make.sh]) AC_CONFIG_FILES([Makefile src/Makefile fish/Makefile po/Makefile.in examples/Makefile appliance/Makefile |