Create installation directories with make install not configure.

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

diff --git a/make/configure.pm b/make/configure.pm
index 02e3a88c32d832a0f1987cc0a62106a0dbe54693..2cd5beb607495feea5c47a76d5db358b58ab6a7c 100644 (file)
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -34,6 +34,7 @@ use Cwd            qw(getcwd);
 use Exporter       qw(import);
 use File::Basename qw(basename);
 
+use make::common;
 use make::console;
 use make::utilities;
 
@@ -66,10 +67,10 @@ sub __get_socketengines {
 
 # TODO: when buildtool is done this can be mostly removed with
 #       the remainder being merged into parse_templates.
-sub __get_template_settings($$) {
+sub __get_template_settings($$$) {
 
        # These are actually hash references
-       my ($config, $compiler) = @_;
+       my ($config, $compiler, $version) = @_;
 
        # Start off by populating with the config
        my %settings = %$config;
@@ -80,8 +81,7 @@ sub __get_template_settings($$) {
        }
 
        # Version information
-       my %version = get_version();
-       while (my ($key, $value) = each %version) {
+       while (my ($key, $value) = each %{$version}) {
                $settings{'VERSION_' . $key} = $value;
        }
 
@@ -93,6 +93,13 @@ sub __get_template_settings($$) {
        return %settings;
 }
 
+sub __test_compiler($) {
+       my $compiler = shift;
+       return 0 unless run_test("`$compiler`", !system "$compiler -v >/dev/null 2>&1");
+       return 0 unless run_test("`$compiler`", test_file($compiler, 'compiler.cpp', '-fno-rtti'), 'compatible');
+       return 1;
+}
+
 sub cmd_clean {
        unlink CONFIGURE_CACHE_FILE;
 }
@@ -143,6 +150,8 @@ MISC OPTIONS
   --clean                       Remove the configuration cache file and start
                                 the interactive configuration wizard.
   --disable-interactive         Disables the interactive configuration wizard.
+  --distribution-label=[text]   Sets a distribution specific version label in
+                                the build configuration.
   --gid=[id|name]               Sets the group to run InspIRCd as.
   --help                        Show this message and exit.
   --socketengine=[name]         Sets the socket engine to be used. Possible
@@ -169,14 +178,16 @@ sub cmd_update {
        print "Updating...\n";
        my %config = read_configure_cache();
        my %compiler = get_compiler_info($config{CXX});
-       parse_templates(\%config, \%compiler);
+       my %version = get_version();
+       parse_templates(\%config, \%compiler, \%version);
        print "Update complete!\n";
        exit 0;
 }
 
-sub run_test($$) {
-       my ($what, $result) = @_;
-       print_format "Checking whether <|GREEN $what|> is available ... ";
+sub run_test($$;$) {
+       my ($what, $result, $adjective) = @_;
+       $adjective ||= 'available';
+       print_format "Checking whether <|GREEN $what|> is $adjective ... ";
        print_format $result ? "<|GREEN yes|>\n" : "<|RED no|>\n";
        return $result;
 }
@@ -241,10 +252,8 @@ sub get_compiler_info($) {
 sub find_compiler {
        my @compilers = qw(c++ g++ clang++ icpc);
        foreach my $compiler (shift || @compilers) {
-               return $compiler if run_test "`$compiler`", test_file $compiler, 'compiler.cpp';
-               if ($^O eq 'darwin') {
-                       return $compiler if run_test "`xcrun $compiler`", test_file "xcrun $compiler", 'compiler.cpp';
-               }
+               return $compiler if __test_compiler $compiler;
+               return "xcrun $compiler" if $^O eq 'darwin' && __test_compiler "xcrun $compiler";
        }
 }
 
@@ -263,13 +272,13 @@ sub get_property($$;$)
        return defined $default ? $default : '';
 }
 
-sub parse_templates($$) {
+sub parse_templates($$$) {
 
        # These are actually hash references
-       my ($config, $compiler) = @_;
+       my ($config, $compiler, $version) = @_;
 
        # Collect settings to be used when generating files
-       my %settings = __get_template_settings($config, $compiler);
+       my %settings = __get_template_settings($config, $compiler, $version);
 
        # Iterate through files in make/template.
        foreach (<make/template/*>) {