From: Nikita A Menkovich <menkovich@gmail.com>
Date: Sat, 2 Apr 2011 10:04:47 +0000 (+0100)
Subject: mkisofs is obsolete.  Require genisoimage everywhere instead.
X-Git-Tag: 1.9.17~15
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=5eaffede90d454a9d6542331a77e3a88928705e3;hp=bbaea1d03acc6f05a52dec11decb9668c9c82912

mkisofs is obsolete.  Require genisoimage everywhere instead.
---

diff --git a/README b/README
index 7fa9e9e..fbff025 100644
--- a/README
+++ b/README
@@ -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 34070db..cf204e7 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 4951f3c..9a20f9b 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 40bf90f..d45e699 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