X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=da29912faef304aad21565ce525ce9ed65982619;hb=f73867184a1d7449f7dfe8e636065f13caf69c9b;hp=664f47ba58b281e1f263b8b110b11ec4c50c4b63;hpb=aee03601ac923906391b438bc4040c4a4265112d;p=qemu-sanity-check.git

diff --git a/configure.ac b/configure.ac
index 664f47b..da29912 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,13 +11,17 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-AC_INIT([qemu-sanity-check],[1.1.1])
+AC_INIT([qemu-sanity-check],[1.1.2])
 AM_INIT_AUTOMAKE([foreign])
 
+dnl Only used temporarily while the spec file is contained in the
+dnl tarball.  We will remove this later.
+AC_SUBST([RPM_RELEASE],[1])
+
 dnl Check for basic C environment.
 AC_PROG_CC_STDC
 AC_PROG_INSTALL
@@ -28,6 +32,20 @@ test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant])
 
 AM_PROG_CC_C_O
 
+dnl Allow the package to override the default list of qemu binary
+dnl names which are tried, since this heavily depends on how qemu
+dnl has been packaged in the downstream distro.
+dnl
+dnl Note that "$canonical_arch" and "$arch" are variables in the
+dnl qemu-sanity-check shell script.  Absolute paths could be used
+dnl here as well.
+AC_ARG_WITH([qemu-list],
+    [AS_HELP_STRING([--with-qemu-list],
+        [list of qemu binaries to try @<:@default=qemu-kvm qemu-system-\$canonical_arch qemu kvm@:>@])],
+    [QEMU_LIST="$withval"],
+    [QEMU_LIST="qemu-kvm qemu-system-\$canonical_arch qemu kvm"])
+AC_SUBST([QEMU_LIST])
+
 AC_PROG_SED
 
 AC_MSG_CHECKING([that a static binary can be built])
@@ -55,6 +73,7 @@ AM_CONDITIONAL([HAVE_POD2MAN], [test "x$POD2MAN" != "xno"])
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([qemu-sanity-check],[chmod 0555 qemu-sanity-check])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile
+                 qemu-sanity-check.spec])
 
 AC_OUTPUT