X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/2dda7734ba19caabfa4d49311d581d1abb3d4277..0ba91c945be8a963ac9d11ae538c4e8b30374558:/configure.ac

diff --git a/configure.ac b/configure.ac
index 0683fd5ceb..61cee965b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,26 +2,53 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.68)
-AC_INIT([Guix], [0.1], [guile-user@gnu.org])
+AC_INIT([GNU Guix], [0.2], [bug-guix@gnu.org], [guix],
+  [http://gnu.org/software/guix/])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.11 gnu silent-rules subdir-objects \
+AM_INIT_AUTOMAKE([1.12 gnu silent-rules subdir-objects \
  color-tests parallel-tests])
 
 AC_CONFIG_SRCDIR([guix.scm])
 AC_CONFIG_MACRO_DIR([m4])
 
+dnl For the C++ code.  This must be used early.
+AC_USE_SYSTEM_EXTENSIONS
+
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.18.1])
 
 guilemoduledir="${datarootdir}/guile/site/2.0"
 AC_SUBST([guilemoduledir])
 
-AC_CANONICAL_HOST
+GUIX_SYSTEM_TYPE
+
+AC_ARG_WITH(store-dir,
+  AC_HELP_STRING([--with-store-dir=PATH],
+    [path of the store (defaults to /nix/store)]),
+  [storedir="$withval"],
+  [storedir="/nix/store"])
+AC_SUBST(storedir)
+
+AC_ARG_ENABLE([daemon],
+  [AS_HELP_STRING([--disable-daemon], [build the Nix daemon (C++)])],
+  [guix_build_daemon="$enableval"],
+  [guix_build_daemon="yes"])
 
-PKG_CHECK_MODULES([GUILE], [guile-2.0])
+# Prepare a version of $localstatedir that does not contain references
+# to shell variables.
+guix_localstatedir="`eval echo $localstatedir | sed -e "s|NONE|/usr/local|g"`"
+AC_SUBST([guix_localstatedir])
+
+PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.5])
 AC_PATH_PROG([GUILE], [guile])
 AC_PATH_PROG([GUILD], [guild])
+if test "x$GUILD" = "x"; then
+   AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.])
+fi
+
+dnl Make sure we have a full-fledged Guile.
+GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads])
 
 AC_ARG_WITH([nix-prefix],
   [AS_HELP_STRING([--with-nix-prefix=DIR], [search for Nix in DIR])],
@@ -37,10 +64,16 @@ AC_ARG_WITH([nix-prefix],
 
 AC_PATH_PROG([NIX_INSTANTIATE], [nix-instantiate])
 AC_PATH_PROG([NIX_HASH], [nix-hash])
-if test "x$NIX_INSTANTIATE$NIX_HASH" = "x"; then
+if test "x$guix_build_daemon$NIX_INSTANTIATE$NIX_HASH" = "xno"; then
    AC_MSG_ERROR([Nix programs not found; please install Nix or use `--with-nix-prefix'.])
 fi
 
+if test "x$NIX_INSTANTIATE" = "x"; then
+   # This program is an optional dependency, so we just want it to be
+   # taken from $PATH if it's not available right now.
+   NIX_INSTANTIATE="nix-instantiate"
+fi
+
 AC_ARG_WITH([nixpkgs],
   [AS_HELP_STRING([--with-nixpkgs=DIR], [search for Nixpkgs in DIR])],
   [case "$withval" in
@@ -49,13 +82,12 @@ AC_ARG_WITH([nixpkgs],
    esac],
   [])
 
+AC_MSG_CHECKING([for Nixpkgs source tree])
 if test -f "$NIXPKGS/default.nix"; then
-   AC_MSG_CHECKING([for Nixpkgs source tree])
    AC_MSG_RESULT([$NIXPKGS])
    AC_SUBST([NIXPKGS])
 else
-   AC_MSG_WARN([Nixpkgs not found; this will prevent most tests from running.])
-   AC_MSG_WARN([Please use `--with-nixpkgs'.])
+   AC_MSG_RESULT([not found])
 fi
 
 AC_ARG_WITH([libgcrypt-prefix],
@@ -63,9 +95,11 @@ AC_ARG_WITH([libgcrypt-prefix],
   [case "$withval" in
     yes|no)
       LIBGCRYPT="libgcrypt"
+      LIBGCRYPT_PREFIX="no"
       ;;
     *)
       LIBGCRYPT="$withval/lib/libgcrypt"
+      LIBGCRYPT_PREFIX="$withval"
       ;;
    esac],
   [LIBGCRYPT="libgcrypt"])
@@ -74,11 +108,21 @@ dnl Library name suitable for `dynamic-link'.
 AC_MSG_CHECKING([for libgcrypt shared library name])
 AC_MSG_RESULT([$LIBGCRYPT])
 AC_SUBST([LIBGCRYPT])
+AC_SUBST([LIBGCRYPT_PREFIX])
+
+GUIX_ASSERT_LIBGCRYPT_USABLE
+
+AC_CACHE_SAVE
+
+m4_include([config-daemon.ac])
 
 AC_CONFIG_FILES([Makefile
                  po/Makefile.in
-		 guix-build])
+		 guix/config.scm])
 
-AC_CONFIG_COMMANDS([commands-exec], [chmod +x guix-build])
+AC_CONFIG_FILES([scripts/guix
+		 pre-inst-env
+		 test-env],
+  [chmod +x scripts/guix pre-inst-env test-env])
 
 AC_OUTPUT