X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=31d3627c77be298192961ba83ebf39c5057be731;hb=0377e9ef5c5aad13a2b4481863b9af3b55719114;hp=18079992297ad6f3886cabdb6452b790c71a74ac;hpb=d3110e6318aa040e499479640ce33efe5ccc0f3e;p=qemu-sanity-check.git

diff --git a/configure.ac b/configure.ac
index 1807999..31d3627 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,13 +11,57 @@
 # 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.6])
 AM_INIT_AUTOMAKE([foreign])
 
+dnl Check for basic C environment.
+AC_PROG_CC_STDC
+AC_PROG_INSTALL
+AC_PROG_CPP
+
+AC_C_PROTOTYPES
+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])
+old_CFLAGS="$CFLAGS"
+old_LDFLAGS="$LDFLAGS"
+CFLAGS="$CFLAGS -static"
+LDFLAGS="$LDFLAGS -static"
+AC_LINK_IFELSE([
+    #include <stdio.h>
+    #include <stdlib.h>
+    int main () { exit (0); }
+],[
+    AC_MSG_RESULT([yes])
+],[
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR([Building a static binary failed.  Make sure you have static libc installed.])
+])
+
 AC_CHECK_PROG([POD2MAN], [pod2man], [pod2man], [no])
 if test "x$POD2MAN" = "xno"; then
     AC_MSG_WARN([pod2man was not found.  This is needed to build man pages.])
@@ -26,7 +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 +x qemu-sanity-check])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([src/qemu-sanity-check],[chmod 0555 src/qemu-sanity-check])
+AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
 
 AC_OUTPUT