X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=31d3627c77be298192961ba83ebf39c5057be731;hb=HEAD;hp=c4b9dfe1a69ead8f6d22a16605f0b65222c26f9f;hpb=dd43593f207ab1854c903b3233d0cbd606ae8be6;p=qemu-sanity-check.git

diff --git a/configure.ac b/configure.ac
index c4b9dfe..31d3627 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,13 +15,9 @@
 # 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.6])
 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],[2])
-
 dnl Check for basic C environment.
 AC_PROG_CC_STDC
 AC_PROG_INSTALL
@@ -32,6 +28,22 @@ test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant])
 
 AM_PROG_CC_C_O
 
+AC_CHECK_HEADERS([sys/reboot.h])
+
+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])
@@ -58,8 +70,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
-                 qemu-sanity-check.spec])
+AC_CONFIG_FILES([src/qemu-sanity-check],[chmod 0555 src/qemu-sanity-check])
+AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
 
 AC_OUTPUT