isolate: Replace system() calls with implementations

[moe.git] / configure

diff --git a/configure b/configure
index 2b6461799a3ef49cb4c5c853cd9a8d2bf78917ce..f2a192cb3ba7405c7ce62df23095b6134d7bf8f0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-# Configure script for MO-Eval
+# Configure script for Moe

 # (c) 2008--2009 Martin Mares <mj@ucw.cz>
 
 use warnings;
 # (c) 2008--2009 Martin Mares <mj@ucw.cz>
 
 use warnings;


@@ -25,11 +25,12 @@ use UCW::Configure::Pkg;
 
 Init($srcdir, "default.cfg");
 Include "ucw/default.cfg";
 
 Init($srcdir, "default.cfg");
 Include "ucw/default.cfg";

-Log "### Configuring MO-Eval ###\n\n";
+Log "### Configuring Moe ###\n\n";

 Include Get("CONFIG");
 require UCW::Configure::Paths;
 require UCW::Configure::C;
 require UCW::Configure::LibUCW;
 Include Get("CONFIG");
 require UCW::Configure::Paths;
 require UCW::Configure::C;
 require UCW::Configure::LibUCW;

+require UCW::Configure::Doc;

 
 if (Get("CONFIG_SUBMIT") || Get("CONFIG_MOP")) {
        # Build libucw only if it is needed
 
 if (Get("CONFIG_SUBMIT") || Get("CONFIG_MOP")) {
        # Build libucw only if it is needed


@@ -38,7 +39,7 @@ if (Get("CONFIG_SUBMIT") || Get("CONFIG_MOP")) {
 
 if (Get("CONFIG_SUBMIT")) {
        # Submit server needs crypto libraries
 
 if (Get("CONFIG_SUBMIT")) {
        # Submit server needs crypto libraries

-       if (!TrivConfig("libgnutls", script => "libgnutls-config") ||
+       if (!PkgConfig("gnutls") && !TrivConfig("libgnutls", script => "libgnutls-config") ||

            !TrivConfig("libgcrypt", script => "libgcrypt-config")) {
                Fail "The libgnutls and libgcrypt libraries are required to build the submit server.";
        }
            !TrivConfig("libgcrypt", script => "libgcrypt-config")) {
                Fail "The libgnutls and libgcrypt libraries are required to build the submit server.";
        }