Wait for the manager bind to come back before sending search in LDAP modules

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index 6fba700ceb4e4ce4f5043abb0b2ee908ccdc4bb5..4db9064b986f6d1d3f3381d7065cbf859d58df0e 100755 (executable)
--- a/configure
+++ b/configure
@@ -116,7 +116,7 @@ if (defined $opt_base_dir) {
 }
 
 if (defined $opt_system) {
-       $config{UID} = $opt_uid || 'ircd';
+       $config{UID} = defined $opt_uid ? $opt_uid : 'ircd';
        $config{CONFIG_DIR} = '/etc/inspircd';
        $config{MODULE_DIR} = '/usr/lib/inspircd';
        $config{BINARY_DIR} = '/usr/sbin/';
@@ -124,7 +124,7 @@ if (defined $opt_system) {
        $config{DATA_DIR} = '/var/inspircd';
        $config{LOG_DIR} = '/var/log/inspircd';
 } else {
-       $config{UID} = $opt_uid || $<;
+       $config{UID} = defined $opt_uid ? $opt_uid : $<;
        $config{CONFIG_DIR} = rel2abs($config{BASE_DIR}."/conf");
        $config{MODULE_DIR} = rel2abs($config{BASE_DIR}."/modules");
        $config{BINARY_DIR} = rel2abs($config{BASE_DIR}."/bin");
@@ -153,12 +153,12 @@ chomp($config{HAS_OPENSSL}  = `pkg-config --modversion openssl 2>/dev/null`);
 
 chomp(our $gnutls_ver = $config{HAS_GNUTLS});
 chomp(our $openssl_ver = $config{HAS_OPENSSL});
-$config{USE_GNUTLS}        = "n";
+$config{USE_GNUTLS}        = 0;
 if (defined $opt_use_gnutls)
 {
        $config{USE_GNUTLS} = "y";                                      # Use gnutls.
 }
-$config{USE_OPENSSL}   = "n";                                          # Use openssl.
+$config{USE_OPENSSL}   = 0;                                            # Use openssl.
 if (defined $opt_use_openssl)
 {
        $config{USE_OPENSSL} = "y";
@@ -281,6 +281,21 @@ STOP
        print "\e[0m\n\n";
        print "The following compiler has been detected: \e[1;32m$cxx{NAME} $cxx{VERSION}\e[0m ($config{CXX})\n\n";
 
+       # Check that the user actually wants this version.
+       if (index($version, '+') != -1) {
+               print <<"EOW" ;
+\e[1;31mWARNING!\e[0m You are building a development version. This contains code which has
+not been tested as heavily and may contain various faults which could seriously
+affect the running of your server. It is recommended that you use a stable
+version instead.
+
+You can obtain the latest stable version from https://github.com/inspircd/inspircd/releases
+or by running `git checkout insp20` if you are installing from Git.
+
+EOW
+       exit 1 unless prompt_bool(1, 'I understand this warning and want to continue anyway.', 0);
+       }
+
        # Directory Settings..
        my $tmpbase = $config{BASE_DIR};
        $config{BASE_DIR} = prompt_dir(1, 'What directory do you wish to install the InspIRCd base?', $config{BASE_DIR});
@@ -440,6 +455,7 @@ sub writefiles {
 #define VERSION "$version"
 #define REVISION "$revision"
 #define SYSTEM "$incos"
+#define INSPIRCD_SOCKETENGINE_NAME "$config{SOCKETENGINE}"
 
 #define CONFIG_PATH "$config{CONFIG_DIR}"
 #define DATA_PATH "$config{DATA_DIR}"