add autoconf infrastructure, including the OCaml M4 macros

Signed-off-by: Anil Madhavapeddy <anil@recoil.org>

diff --git a/.hgignore b/.hgignore
index e3e9388f57961a7cc0e2bfe37987ad93edb10a88..d42d65abe795d3bd6b0c5d550ddcd73b45e09b2c 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -8,3 +8,9 @@
 \.a$
 \.annot$
 \/META$
+autom4te\.cache/
+\.swp$
+^stdext/config\.h$
+^config\.log$
+^config\.status$
+^configure$

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 40bf8c4..0000000
--- a/Makefile
+++ /dev/null
@@ -1,139 +0,0 @@
-.PHONY: all
-all:
-       $(MAKE) -C uuid
-       $(MAKE) -C camldm
-       $(MAKE) -C stdext
-       $(MAKE) -C log
-       $(MAKE) -C stunnel
-       $(MAKE) -C pciutil
-       $(MAKE) -C cdrom
-       $(MAKE) -C xml-light2
-       $(MAKE) -C rss
-       $(MAKE) -C rpc-light
-       $(MAKE) -C http-svr
-       $(MAKE) -C close-and-exec
-       $(MAKE) -C sexpr
-
-.PHONY: allxen
-allxen: all
-       $(MAKE) -C mmap
-       $(MAKE) -C xc
-       $(MAKE) -C xb
-       $(MAKE) -C xs
-       $(MAKE) -C xsrpc
-       $(MAKE) -C eventchn
-
-install:
-       $(MAKE) -C uuid install
-       $(MAKE) -C camldm install
-       $(MAKE) -C stdext install
-       $(MAKE) -C log install
-       $(MAKE) -C stunnel install
-       $(MAKE) -C pciutil install
-       $(MAKE) -C cdrom install
-       $(MAKE) -C xml-light2 install
-       $(MAKE) -C rss install
-       $(MAKE) -C rpc-light install
-       $(MAKE) -C http-svr install
-       $(MAKE) -C close-and-exec install
-       $(MAKE) -C sexpr install
-
-installxen:
-       $(MAKE) -C mmap install
-       $(MAKE) -C xc install
-       $(MAKE) -C xb install
-       $(MAKE) -C xs install
-       $(MAKE) -C xsrpc install
-       $(MAKE) -C eventchn install
-
-uninstall:
-       $(MAKE) -C uuid uninstall
-       $(MAKE) -C camldm uninstall
-       $(MAKE) -C stdext uninstall
-       $(MAKE) -C log uninstall
-       $(MAKE) -C stunnel uninstall
-       $(MAKE) -C pciutil uninstall
-       $(MAKE) -C cdrom uninstall
-       $(MAKE) -C xml-light2 uninstall
-       $(MAKE) -C rss uninstall
-       $(MAKE) -C rpc-light uninstall
-       $(MAKE) -C http-svr uninstall
-       $(MAKE) -C close-and-exec uninstall
-       $(MAKE) -C sexpr uninstall
-
-uninstallxen:
-       $(MAKE) -C eventchn uninstall
-       $(MAKE) -C xsrpc uninstall
-       $(MAKE) -C xs uninstall
-       $(MAKE) -C xb uninstall
-       $(MAKE) -C xc uninstall
-       $(MAKE) -C mmap uninstall
-
-bins:
-       $(MAKE) -C pciutil bins
-       $(MAKE) -C xml-light2 bins
-       $(MAKE) -C sexpr bins
-       $(MAKE) -C stdext bins
-       $(MAKE) -C close-and-exec bins
-
-bininstall:
-       $(MAKE) -C pciutil bininstall
-       $(MAKE) -C xml-light2 bininstall
-       $(MAKE) -C sexpr bininstall
-       $(MAKE) -C stdext bininstall
-       $(MAKE) -C close-and-exec bininstall
-
-binuninstall:
-       $(MAKE) -C pciutil binuninstall
-       $(MAKE) -C xml-light2 binuninstall
-       $(MAKE) -C sexpr binuninstall
-       $(MAKE) -C stdext binuninstall
-       $(MAKE) -C close-and-exec binuninstall
-
-.PHONY: doc
-doc:
-       $(MAKE) -C uuid doc
-       $(MAKE) -C stdext doc
-       $(MAKE) -C sexpr doc
-       $(MAKE) -C log doc
-       $(MAKE) -C xb doc
-       $(MAKE) -C xc doc
-       $(MAKE) -C xs doc
-       $(MAKE) -C xml-light2 doc
-       $(MAKE) -C rpc-light doc
-       $(MAKE) -C http-svr doc
-       $(MAKE) -C camldm doc
-       $(MAKE) -C cdrom doc
-       $(MAKE) -C eventchn doc
-       $(MAKE) -C pciutil doc
-       $(MAKE) -C rss doc
-       $(MAKE) -C stunnel doc
-       $(MAKE) -C xsrpc doc
-       $(MAKE) -C mmap doc
-
-.PHONY: clean
-clean:
-       make -C uuid clean
-       make -C camldm clean
-       make -C stdext clean
-       make -C log clean
-       make -C stunnel clean
-       make -C pciutil clean
-       make -C cdrom clean
-       make -C xml-light2 clean
-       make -C rss clean
-       make -C rpc-light clean
-       make -C http-svr clean
-       make -C close-and-exec clean
-       make -C sexpr clean
-       make -C doc clean
-
-cleanxen:
-       $(MAKE) -C mmap clean
-       $(MAKE) -C xc clean
-       $(MAKE) -C xb clean
-       $(MAKE) -C xs clean
-       $(MAKE) -C xsrpc clean
-       $(MAKE) -C eventchn clean
-
-

diff --git a/Makefile.in b/Makefile.in
index 0a0f7d8656b042a501ba73dd84766907bc663cf6..6fbb68617ecb3303b7996d404e626dc1d5756430 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,132 +1,73 @@
-AUTOMAKE_OPTIONS = foreign
-HAVE_XEN = @XEN@
-HAVE_DEVICE_MAPPER = @DEVICE_MAPPER@
-HAVE_LINUX_CDROM = @LINUX_CDROM@
-HAVE_XMLM = @OCAML_PKG_xmlm@
-HAVE_TYPECONV = @OCAML_PKG_type_conv@
-
 .PHONY: all
 all:
        $(MAKE) -C uuid
-ifeq ($(HAVE_TYPECONV),type-conv)
-       $(MAKE) -C rpc-light
-endif
+       $(MAKE) -C camldm
        $(MAKE) -C stdext
        $(MAKE) -C log
        $(MAKE) -C stunnel
        $(MAKE) -C pciutil
+       $(MAKE) -C cdrom
+       $(MAKE) -C xml-light2
+       $(MAKE) -C rss
+       $(MAKE) -C rpc-light
        $(MAKE) -C http-svr
        $(MAKE) -C close-and-exec
        $(MAKE) -C sexpr
 
-ifeq ($(HAVE_XMLM),xmlm)
-       $(MAKE) -C xml-light2
-       $(MAKE) -C rss
-endif
-ifeq ($(HAVE_LINUX_CDROM),1)
-       $(MAKE) -C cdrom
-endif
-ifeq ($(HAVE_DEVICE_MAPPER),1)
-       $(MAKE) -C camldm
-       $(MAKE) -C mlvm
-endif
-       $(MAKE) -C forking_executioner
-       $(MAKE) -C xen-utils
-
 .PHONY: allxen
 allxen:
-ifeq ($(HAVE_XEN),1)
        $(MAKE) -C mmap
-       $(MAKE) -C netdev
        $(MAKE) -C xc
        $(MAKE) -C xb
        $(MAKE) -C xs
        $(MAKE) -C xsrpc
        $(MAKE) -C eventchn
-       $(MAKE) -C cpuid
-       $(MAKE) -C vhd
-       $(MAKE) -C tapctl
-endif
 
 install:
        $(MAKE) -C uuid install
+       $(MAKE) -C camldm install
        $(MAKE) -C stdext install
        $(MAKE) -C log install
        $(MAKE) -C stunnel install
        $(MAKE) -C pciutil install
+       $(MAKE) -C cdrom install
+       $(MAKE) -C xml-light2 install
+       $(MAKE) -C rss install
+       $(MAKE) -C rpc-light install
        $(MAKE) -C http-svr install
        $(MAKE) -C close-and-exec install
        $(MAKE) -C sexpr install
-ifeq ($(HAVE_TYPECONV),type-conv)
-       $(MAKE) -C rpc-light install
-endif
-ifeq ($(HAVE_XMLM),xmlm)
-       $(MAKE) -C xml-light2 install
-       $(MAKE) -C rss install
-endif
-ifeq ($(HAVE_LINUX_CDROM),1)
-       $(MAKE) -C cdrom install
-endif
-ifeq ($(HAVE_DEVICE_MAPPER),1)
-       $(MAKE) -C camldm install
-       $(MAKE) -C mlvm install
-endif
-       $(MAKE) -C forking_executioner install
-       $(MAKE) -C xen-utils install
 
 installxen:
-ifeq ($(HAVE_XEN),1)
        $(MAKE) -C mmap install
-       $(MAKE) -C netdev install
        $(MAKE) -C xc install
        $(MAKE) -C xb install
        $(MAKE) -C xs install
        $(MAKE) -C xsrpc install
        $(MAKE) -C eventchn install
-       $(MAKE) -C cpuid install
-       $(MAKE) -C vhd install
-       $(MAKE) -C tapctl install
-endif
 
 uninstall:
        $(MAKE) -C uuid uninstall
+       $(MAKE) -C camldm uninstall
        $(MAKE) -C stdext uninstall
        $(MAKE) -C log uninstall
        $(MAKE) -C stunnel uninstall
        $(MAKE) -C pciutil uninstall
+       $(MAKE) -C cdrom uninstall
+       $(MAKE) -C xml-light2 uninstall
+       $(MAKE) -C rss uninstall
+       $(MAKE) -C rpc-light uninstall
        $(MAKE) -C http-svr uninstall
        $(MAKE) -C close-and-exec uninstall
        $(MAKE) -C sexpr uninstall
-ifeq ($(HAVE_TYPECONV),type-conv)
-       $(MAKE) -C rpc-light uninstall
-endif
-ifeq ($(HAVE_XMLM),xmlm)
-       $(MAKE) -C xml-light2 uninstall
-       $(MAKE) -C rss uninstall
-endif
-ifeq ($(HAVE_LINUX_CDROM),1)
-       $(MAKE) -C cdrom uninstall
-endif
-ifeq ($(HAVE_DEVICE_MAPPER),1)
-       $(MAKE) -C camldm uninstall
-       $(MAKE) -C mlvm uninstall
-endif
-       $(MAKE) -C forking_executioner uninstall
-       $(MAKE) -C xen-utils uninstall
 
 uninstallxen:
-ifeq ($(HAVE_XEN),1)
        $(MAKE) -C eventchn uninstall
        $(MAKE) -C xsrpc uninstall
-       $(MAKE) -C netdev uninstall
        $(MAKE) -C xs uninstall
        $(MAKE) -C xb uninstall
        $(MAKE) -C xc uninstall
        $(MAKE) -C mmap uninstall
-       $(MAKE) -C cpuid uninstall
-       $(MAKE) -C vhd uninstall
-       $(MAKE) -C tapctl uninstall
-endif
 
 bins:
        $(MAKE) -C pciutil bins
@@ -141,7 +82,6 @@ bininstall:
        $(MAKE) -C sexpr bininstall
        $(MAKE) -C stdext bininstall
        $(MAKE) -C close-and-exec bininstall
-       $(MAKE) -C forking_executioner bininstall
 
 binuninstall:
        $(MAKE) -C pciutil binuninstall
@@ -149,7 +89,6 @@ binuninstall:
        $(MAKE) -C sexpr binuninstall
        $(MAKE) -C stdext binuninstall
        $(MAKE) -C close-and-exec binuninstall
-       $(MAKE) -C forking_executioner binuninstall
 
 .PHONY: doc
 doc:
@@ -171,59 +110,28 @@ doc:
        $(MAKE) -C stunnel doc
        $(MAKE) -C xsrpc doc
        $(MAKE) -C mmap doc
-       $(MAKE) -C netdev doc
-       $(MAKE) -C forking_executioner doc
-       $(MAKE) -C mlvm doc
-       $(MAKE) -C cpuid doc
-       $(MAKE) -C vhd doc
-       $(MAKE) -C tapctl doc
-       $(MAKE) -C xen-utils doc
 
 .PHONY: clean
 clean:
-       $(MAKE) -C uuid clean
-       $(MAKE) -C camldm clean
-       $(MAKE) -C stdext clean
-       $(MAKE) -C log clean
-       $(MAKE) -C stunnel clean
-       $(MAKE) -C pciutil clean
-       $(MAKE) -C cdrom clean
-       $(MAKE) -C xml-light2 clean
-       $(MAKE) -C rss clean
-       $(MAKE) -C rpc-light clean
-       $(MAKE) -C http-svr clean
-       $(MAKE) -C close-and-exec clean
-       $(MAKE) -C sexpr clean
-       $(MAKE) -C doc clean
-       $(MAKE) -C forking_executioner clean
-       $(MAKE) -C mlvm clean
-       $(MAKE) -C cpuid clean
-       $(MAKE) -C vhd clean
-       $(MAKE) -C tapctl clean
-       $(MAKE) -C xen-utils clean
+       make -C uuid clean
+       make -C camldm clean
+       make -C stdext clean
+       make -C log clean
+       make -C stunnel clean
+       make -C pciutil clean
+       make -C cdrom clean
+       make -C xml-light2 clean
+       make -C rss clean
+       make -C rpc-light clean
+       make -C http-svr clean
+       make -C close-and-exec clean
+       make -C sexpr clean
+       make -C doc clean
 
 cleanxen:
        $(MAKE) -C mmap clean
-       $(MAKE) -C netdev clean
        $(MAKE) -C xc clean
        $(MAKE) -C xb clean
        $(MAKE) -C xs clean
        $(MAKE) -C xsrpc clean
        $(MAKE) -C eventchn clean
-
-RPM_SPECSDIR=/usr/src/redhat/SPECS
-RPM_SOURCEDIR=/usr/src/redhat/SOURCES
-XEN_RELEASE=xcp0.2
-
-$(RPM_SPECSDIR)/xapi-libs.spec: xapi.spec.in
-       sed -e s\,@XEN_RELEASE@,$(XEN_RELEASE),g   \
-           < xapi.spec.in                         \
-           > $(RPM_SPECSDIR)/xapi-libs.spec
-
-$(RPM_SOURCEDIR)/xapi-libs-0.tar.bz2:
-       hg archive -p xapi-0 -t tbz2 $(RPM_SOURCEDIR)/xapi-libs-0.tar.bz2
-
-.PHONY: rpm
-rpm: $(RPM_SPECSDIR)/xapi-libs.spec $(RPM_SOURCEDIR)/xapi-libs-0.tar.bz2
-       rpmbuild -ba $(RPM_SPECSDIR)/xapi-libs.spec
-

diff --git a/configure.ac b/configure.ac
index dd540174c50ad3bd1c9d63ea7f0df2eed5bcbf00..5c8c18a3a4d6dacf0a6090dcb8cf5c54089ae106 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 # -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.59])
+AC_PREREQ([2.63])
 AC_INIT([xen-api-libs], [0.1], [xen-api@lists.xensource.com])
 AC_CONFIG_SRCDIR([])
-AC_CONFIG_HEADERS([include/config.h])
+AC_CONFIG_HEADERS([stdext/config.h])
 AC_CONFIG_AUX_DIR(./mk)
 
 AC_CANONICAL_SYSTEM
@@ -26,17 +26,8 @@ AC_PROG_MAKE_SET
 
 # Checks for header files.
 AC_CHECK_HEADERS([string.h sys/param.h])
-AC_CHECK_HEADERS([xen/xen.h],[XEN=1],[XEN=0])
-AC_CHECK_HEADERS([libdevmapper.h], [DEVICE_MAPPER=1], [DEVICE_MAPPER=0])
-AC_CHECK_HEADERS([linux/cdrom.h], [LINUX_CDROM=1], [LINUX_CDROM=0])
 
 # Checks for typedefs, structures, and compiler characteristics.
-AC_CHECK_DECLS([XS_RESTRICT],[],[],[
-[
-#include <errno.h>
-#include <xenctrl.h>
-#include <xen/io/xs_wire.h>
-]])
 
 # Checks for library functions.
 AC_CHECK_FUNCS([realpath])
@@ -51,13 +42,5 @@ if test "$OCAMLFIND" = "no"; then
   AC_MSG_ERROR([You must install OCaml findlib (the ocamlfind command)])
 fi
 
-AC_CHECK_OCAML_PKG([xmlm])
-AC_CHECK_OCAML_PKG([type-conv])
-
 AC_CONFIG_FILES([Makefile])
-AC_SUBST([XEN])
-AC_SUBST([DEVICE_MAPPER])
-AC_SUBST([LINUX_CDROM])
-AC_SUBST([OCAML_PKG_xmlm])
-AC_SUBST([OCAML_PKG_type_conv])
 AC_OUTPUT

diff --git a/stdext/config.h.in b/stdext/config.h.in
new file mode 100644 (file)
index 0000000..77a8732
--- /dev/null
+++ b/stdext/config.h.in
@@ -0,0 +1 @@
+// Autoconf config.h file