diff options
| author | Nikita A Menkovich <menkovich@gmail.com> | 2011-04-02 11:04:47 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-04-02 11:04:47 +0100 |
| commit | 5eaffede90d454a9d6542331a77e3a88928705e3 (patch) | |
| tree | 33c9d2a438d0cd543d41018a8db182a0e5a187ba | |
| parent | bbaea1d03acc6f05a52dec11decb9668c9c82912 (diff) | |
| download | libguestfs-5eaffede90d454a9d6542331a77e3a88928705e3.tar.gz libguestfs-5eaffede90d454a9d6542331a77e3a88928705e3.tar.xz libguestfs-5eaffede90d454a9d6542331a77e3a88928705e3.zip | |
mkisofs is obsolete. Require genisoimage everywhere instead.
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | images/Makefile.am | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -40,7 +40,7 @@ Requirements - squashfs-tools (mksquashfs only) -- genisoimage / mkisofs +- genisoimage (NOT mkisofs any more) - hivex >= 1.2.1 (http://libguestfs.org/download) diff --git a/configure.ac b/configure.ac index 34070dbb..cf204e71 100644 --- a/configure.ac +++ b/configure.ac @@ -270,10 +270,10 @@ else fi AC_SUBST([POD2_UTF8_OPTION]) -dnl Check for mkisofs. -AC_PATH_PROGS([MKISOFS],[mkisofs],[no], +dnl Check for genisoimage. +AC_PATH_PROGS([GENISOIMAGE],[genisoimage],[no], [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin]) -test "x$MKISOFS" = "xno" && AC_MSG_ERROR([mkisofs must be installed]) +test "x$GENISOIMAGE" = "xno" && AC_MSG_ERROR([genisoimage must be installed]) dnl Check for optional xmllint. AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no]) diff --git a/debian/control b/debian/control index 4951f3c4..9a20f9b2 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7), autotools-dev, libmagic-dev, libncurses5-dev, libpcre3-dev, libxml2-dev, qemu-system (>= 0.13) | kvm (>= 0.13) | qemu-kvm (>= 0.13) | qemu (>= 0.13), # XXX how to say we need Linux >= 2.6.36? - mkisofs, pkg-config, + genisoimage, pkg-config, # when building from git: automake, autoconf, libtool, ocaml, # for python bindings: diff --git a/images/Makefile.am b/images/Makefile.am index 40bf90fd..d45e6995 100644 --- a/images/Makefile.am +++ b/images/Makefile.am @@ -101,7 +101,7 @@ images_files = $(images_files_src) $(images_files_build) test.iso: $(images_files) rm -f $@ $@-t mkdir -p directory - $(MKISOFS) -J -r -graft-points \ + $(GENISOIMAGE) -J -r -graft-points \ -o $@-t \ $(images_files) /directory=directory rmdir directory |