X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=baa8de16306e6757a3335418f4045929a79a85b1;hb=f1a10c6285cca30f8c9491ae08951137457bb018;hp=0a0a450681159e408cab3f86a5954dbc080f836d;hpb=acf9000252da7f4f3fde693ecc03461007cf0bf9;p=libguestfs.git

diff --git a/configure.ac b/configure.ac
index 0a0a450..baa8de1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_INIT([libguestfs],[0.5])
+AC_INIT([libguestfs],[0.8])
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -30,7 +30,7 @@ AC_PROG_CPP
 AC_C_PROTOTYPES
 test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant])
 
-AC_PROG_CC_C_O
+AM_PROG_CC_C_O
 
 dnl Check support for 64 bit file offsets.
 AC_SYS_LARGEFILE
@@ -90,6 +90,18 @@ AC_DEFINE_UNQUOTED([REPO],["$REPO"],[Name of Fedora repository.])
 
 AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.])
 
+dnl --with-updates to specify a Fedora updates repository.
+AC_ARG_WITH([updates],
+	[AS_HELP_STRING([--with-updates],
+	  [set name of Fedora updates repository @<:@default=updates-released-f10@:>@])],
+	[],
+	[with_updates=updates-released-f10])
+UPDATES="$with_updates"
+AC_SUBST(UPDATES)
+AC_DEFINE_UNQUOTED([UPDATES],["$UPDATES"],[Name of Fedora updates repository.])
+
+AC_DEFINE_UNQUOTED([host_cpu],["$host_cpu"],[Host architecture.])
+
 dnl --with-mirror to specify a local Fedora mirror.
 AC_ARG_WITH([mirror],
 	[AS_HELP_STRING([--with-mirror],
@@ -101,7 +113,8 @@ AC_SUBST(MIRROR)
 
 dnl Check for OCaml (optional, for OCaml bindings).
 AC_PROG_OCAML
-AM_CONDITIONAL([HAVE_OCAML],[test "x$OCAMLC" != "xno"])
+AC_PROG_FINDLIB
+AM_CONDITIONAL([HAVE_OCAML],[test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno"])
 
 dnl Check for Perl (optional, for Perl bindings).
 dnl XXX This isn't quite right, we should check for devel libraries.
@@ -119,10 +132,13 @@ AC_CONFIG_SUBDIRS([daemon])
 dnl Produce output files.
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile src/Makefile fish/Makefile examples/Makefile
-		 images/Makefile ocaml/Makefile perl/Makefile
+		 images/Makefile
+		 ocaml/Makefile ocaml/examples/Makefile
+		 perl/Makefile
 		 python/Makefile
 	         make-initramfs.sh update-initramfs.sh
-		 libguestfs.spec])
+		 libguestfs.spec
+		 ocaml/META perl/Makefile.PL])
 AC_OUTPUT
 
 dnl WTF?