Author: eelco
Date: Mon Apr 11 10:13:53 2011
New Revision: 26776
URL: https://svn.nixos.org/websvn/nix/?rev=26776&sc=1
Log:
* configure: detect whether DBD::SQLite is present. If necessary the
location to DBI and DBD::SQLite can be passed with --with-dbi and
--with-dbd-sqlite.
Modified:
nix/trunk/configure.ac
nix/trunk/scripts/GeneratePatches.pm.in (contents, props changed)
nix/trunk/scripts/download-using-manifests.pl.in
nix/trunk/scripts/nix-generate-patches.in
nix/trunk/scripts/nix-pull.in
nix/trunk/scripts/nix-push.in
nix/trunk/substitute.mk
Modified: nix/trunk/configure.ac
==============================================================================
--- nix/trunk/configure.ac Mon Apr 11 09:11:36 2011 (r26775)
+++ nix/trunk/configure.ac Mon Apr 11 10:13:53 2011 (r26776)
@@ -171,6 +171,7 @@
AC_SUBST(openssl_prog)
AC_DEFINE_UNQUOTED(OPENSSL_PATH, ["$openssl_prog"], [Path of the OpenSSL
binary])
+
# Test that Perl has the open/fork feature (Perl 5.8.0 and beyond).
AC_MSG_CHECKING([whether Perl is recent enough])
if ! $perl -e 'open(FOO, "-|", "true"); while (<FOO>) { print; }; close FOO or
die;'; then
@@ -179,6 +180,7 @@
fi
AC_MSG_RESULT(yes)
+
NEED_PROG(cat, cat)
NEED_PROG(tr, tr)
AC_ARG_WITH(coreutils-bin, AC_HELP_STRING([--with-coreutils-bin=PATH],
@@ -186,6 +188,7 @@
coreutils=$withval, coreutils=$(dirname $cat))
AC_SUBST(coreutils)
+
AC_ARG_WITH(docbook-rng, AC_HELP_STRING([--with-docbook-rng=PATH],
[path of the DocBook RelaxNG schema]),
docbookrng=$withval, docbookrng=/docbook-rng-missing)
@@ -196,16 +199,19 @@
docbookxsl=$withval, docbookxsl=/docbook-xsl-missing)
AC_SUBST(docbookxsl)
+
AC_ARG_WITH(xml-flags, AC_HELP_STRING([--with-xml-flags=FLAGS],
[extra flags to be passed to xmllint and xsltproc]),
xmlflags=$withval, xmlflags=)
AC_SUBST(xmlflags)
+
AC_ARG_WITH(store-dir, AC_HELP_STRING([--with-store-dir=PATH],
[path of the Nix store]),
storedir=$withval, storedir='/nix/store')
AC_SUBST(storedir)
+
AC_ARG_WITH(openssl, AC_HELP_STRING([--with-openssl=PATH],
[prefix of the OpenSSL library]),
openssl=$withval, openssl=)
@@ -217,6 +223,7 @@
AC_DEFINE(HAVE_OPENSSL, 1, [Whether to use OpenSSL.])
fi
+
AC_ARG_WITH(bzip2, AC_HELP_STRING([--with-bzip2=PATH],
[prefix of bzip2]),
bzip2=$withval, bzip2=)
@@ -243,6 +250,7 @@
AC_SUBST(bzip2_bin)
AC_SUBST(bzip2_bin_test)
+
AC_ARG_WITH(sqlite, AC_HELP_STRING([--with-sqlite=PATH],
[prefix of SQLite]),
sqlite=$withval, sqlite=)
@@ -262,6 +270,7 @@
AC_SUBST(sqlite_include)
AC_SUBST(sqlite_bin)
+
# Whether to use the Boehm garbage collector.
AC_ARG_ENABLE(gc, AC_HELP_STRING([--enable-gc],
[enable garbage collection in the Nix expression evaluator (requires Boehm
GC)]),
@@ -273,6 +282,25 @@
fi
+# Check for the required Perl dependencies (DBI and DBD::SQLite).
+AC_ARG_WITH(dbi, AC_HELP_STRING([--with-dbi=PATH],
+ [prefix of the Perl DBI library]),
+ perlFlags="$perlFlags -I$withval")
+
+AC_ARG_WITH(dbd-sqlite, AC_HELP_STRING([--with-dbd-sqlite=PATH],
+ [prefix of the Perl DBD::SQLite library]),
+ perlFlags="$perlFlags -I$withval")
+
+AC_MSG_CHECKING([whether DBD::SQLite works])
+if ! $perl $perlFlags -e 'use DBI; use DBD::SQLite;' 2>&5; then
+ AC_MSG_RESULT(no)
+ AC_MSG_FAILURE([The Perl modules DBI and/or DBD::SQLite are missing.])
+fi
+AC_MSG_RESULT(yes)
+
+AC_SUBST(perlFlags)
+
+
AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state],
[do not initialise DB etc. in `make install']),
init_state=$enableval, init_state=yes)
Modified: nix/trunk/scripts/GeneratePatches.pm.in
==============================================================================
--- nix/trunk/scripts/GeneratePatches.pm.in Mon Apr 11 09:11:36 2011
(r26775)
+++ nix/trunk/scripts/GeneratePatches.pm.in Mon Apr 11 10:13:53 2011
(r26776)
@@ -1,5 +1,3 @@
-#! @perl@ -w -I@libexecdir@/nix
-
use strict;
use File::Temp qw(tempdir);
use File::stat;
Modified: nix/trunk/scripts/download-using-manifests.pl.in
==============================================================================
--- nix/trunk/scripts/download-using-manifests.pl.in Mon Apr 11 09:11:36
2011 (r26775)
+++ nix/trunk/scripts/download-using-manifests.pl.in Mon Apr 11 10:13:53
2011 (r26776)
@@ -1,4 +1,4 @@
-#! @perl@ -w -I@libexecdir@/nix
+#! @perl@ -w -I@libexecdir@/nix @perlFlags@
use strict;
use NixManifest;
Modified: nix/trunk/scripts/nix-generate-patches.in
==============================================================================
--- nix/trunk/scripts/nix-generate-patches.in Mon Apr 11 09:11:36 2011
(r26775)
+++ nix/trunk/scripts/nix-generate-patches.in Mon Apr 11 10:13:53 2011
(r26776)
@@ -1,4 +1,4 @@
-#! @perl@ -w -I@libexecdir@/nix
+#! @perl@ -w -I@libexecdir@/nix @perlFlags@
use strict;
use File::Temp qw(tempdir);
Modified: nix/trunk/scripts/nix-pull.in
==============================================================================
--- nix/trunk/scripts/nix-pull.in Mon Apr 11 09:11:36 2011 (r26775)
+++ nix/trunk/scripts/nix-pull.in Mon Apr 11 10:13:53 2011 (r26776)
@@ -1,4 +1,4 @@
-#! @perl@ -w -I@libexecdir@/nix
+#! @perl@ -w -I@libexecdir@/nix @perlFlags@
use strict;
use File::Temp qw(tempdir);
Modified: nix/trunk/scripts/nix-push.in
==============================================================================
--- nix/trunk/scripts/nix-push.in Mon Apr 11 09:11:36 2011 (r26775)
+++ nix/trunk/scripts/nix-push.in Mon Apr 11 10:13:53 2011 (r26776)
@@ -1,4 +1,4 @@
-#! @perl@ -w -I@libexecdir@/nix
+#! @perl@ -w -I@libexecdir@/nix @perlFlags@
use strict;
use File::Temp qw(tempdir);
Modified: nix/trunk/substitute.mk
==============================================================================
--- nix/trunk/substitute.mk Mon Apr 11 09:11:36 2011 (r26775)
+++ nix/trunk/substitute.mk Mon Apr 11 10:13:53 2011 (r26776)
@@ -15,6 +15,7 @@
-e "s^@bunzip2\@^$(bzip2_bin)/bunzip2^g" \
-e "s^@bzip2_bin_test\@^$(bzip2_bin_test)^g" \
-e "s^@perl\@^$(perl)^g" \
+ -e "s^@perlFlags\@^$(perlFlags)^g" \
-e "s^@coreutils\@^$(coreutils)^g" \
-e "s^@sed\@^$(sed)^g" \
-e "s^@tar\@^$(tar)^g" \
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
