X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=7606bcae166e2d00e661e68424d72383e5ff93d7;hb=ddbfd96c3d21d05170a0af7de427c3dcbd72f014;hp=114d38faa1e7745ff7429c09bf2b13b21125ea13;hpb=e6fb84221e0ca39858f8e09e289c52b5c07d4ddf;p=febootstrap.git

diff --git a/configure.ac b/configure.ac
index 114d38f..7606bca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl febootstrap configure.ac
-dnl (C) Copyright 2009-2010 Red Hat Inc.
+dnl (C) Copyright 2009-2011 Red Hat Inc.
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@ dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 dnl
 dnl Written by Richard W.M. Jones <rjones@redhat.com>
 
-AC_INIT(febootstrap,2.10)
+AC_INIT(febootstrap,3.5)
 AM_INIT_AUTOMAKE
 
 dnl Check for basic C environment.
@@ -37,30 +37,56 @@ AC_SYS_LARGEFILE
 
 gl_INIT
 
+# OCaml and ocamlfind are required to compile.
+AC_PROG_OCAML
+if test "$OCAMLC" = "no"; then
+    AC_MSG_ERROR([You must install the OCaml compiler])
+fi
+AM_CONDITIONAL([HAVE_OCAMLOPT],[test "$OCAMLBEST" = "opt"])
+AC_PROG_FINDLIB
+if test "$OCAMLFIND" = "no"; then
+    AC_MSG_ERROR([You must install OCaml findlib (the ocamlfind command)])
+fi
+
+dnl Optional programs.
 AC_CHECK_PROG(PERLDOC,[perldoc],[perldoc],[no])
 if test "x$PERLDOC" = "xno" ; then
   AC_MSG_WARN([perldoc not found - install perl to make man pages])
 fi
 AM_CONDITIONAL(HAVE_PERLDOC,[test "$perldoc" != "no"])
 
-AC_CHECK_PROG(FAKEROOT,[fakeroot],[fakeroot],[no])
-if test "x$FAKEROOT" = "xno" ; then
-  AC_MSG_FAILURE([fakeroot program not found])
-fi
+dnl For yum-rpm handler.
+AC_CHECK_PROG(YUM,[yum],[yum],[no])
+AC_CHECK_PROG(RPM,[rpm],[rpm],[no])
+AC_CHECK_PROG(YUMDOWNLOADER,[yumdownloader],[yumdownloader],[no])
 
-AC_CHECK_PROG(FAKECHROOT,[fakechroot],[fakechroot],[no])
-if test "x$FAKECHROOT" = "xno" ; then
-  AC_MSG_FAILURE([fakechroot program not found])
-fi
+dnl For Debian handler.
+AC_CHECK_PROG(APTITUDE,[aptitude],[aptitude],[no])
+AC_CHECK_PROG(DPKG,[dpkg],[dpkg],[no])
 
-AC_CHECK_PROG(YUM,[yum],[yum],[no])
-if test "x$YUM" = "xno" ; then
-  AC_MSG_FAILURE([yum program not found])
+dnl For ArchLinux handler.
+AC_CHECK_PROG(PACMAN,[pacman],[pacman],[no])
+
+dnl Required programs, libraries.
+AC_PATH_PROG([INSMODSTATIC],[insmod.static],[no],
+             [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR])
+if test "x$INSMODSTATIC" = "xno" ; then
+  AC_MSG_FAILURE([insmod.static program not found
+
+Is /sbin in your current path?
+
+Note that Debian/Ubuntu do not package this file from module-init-tools.
+Sorry, please fix your distribution.  In the meantime you can copy
+/sbin/insmod.static from a Fedora machine.
+])
 fi
+AC_DEFINE_UNQUOTED([INSMODSTATIC],["$INSMODSTATIC"],
+  [Full path to the insmod.static program.])
 
-AC_PATH_PROG([MKE2FS],[mke2fs],[no])
+AC_PATH_PROG([MKE2FS],[mke2fs],[no],
+             [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR])
 if test "x$MKE2FS" = "xno" ; then
-  AC_MSG_FAILURE([mke2fs program not found (is /sbin in your current path?)])
+  AC_MSG_FAILURE([mke2fs program not found])
 fi
 AC_DEFINE_UNQUOTED([MKE2FS],["$MKE2FS"],
   [Full path to the mke2fs program.])
@@ -82,5 +108,9 @@ AC_CHECK_HEADER([ext2fs/ext2fs.h],[],[
 ])
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile lib/Makefile helper/Makefile examples/Makefile])
+AC_CONFIG_FILES([config.ml
+        debian/changelog
+        Makefile
+        lib/Makefile
+        helper/Makefile])
 AC_OUTPUT