X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=0a7ea566a0e96406ea664a6aca1a31c1b3bb1eb1;hb=6d775e0127aa52964f2fecd9fbac2f2cfd996d92;hp=82d14f5649d7f0f847de376bf8c3cbcc3bed68b5;hpb=b8babf2c43edd0f1ee2997125c6ea4cd21e15d68;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/configure.pm b/make/configure.pm index 82d14f564..0a7ea566a 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -34,12 +34,13 @@ use warnings FATAL => qw(all); use Cwd qw(getcwd); use Exporter qw(import); use File::Basename qw(basename dirname); -use File::Spec::Functions qw(catfile); +use File::Spec::Functions qw(catdir catfile); use make::common; use make::console; -use constant CONFIGURE_DIRECTORY => '.configure'; +use constant CONFIGURE_ROOT => dirname dirname __FILE__; +use constant CONFIGURE_DIRECTORY => catdir(CONFIGURE_ROOT, '.configure'); use constant CONFIGURE_CACHE_FILE => catfile(CONFIGURE_DIRECTORY, 'cache.cfg'); use constant CONFIGURE_CACHE_VERSION => '1'; use constant CONFIGURE_ERROR_PIPE => $ENV{INSPIRCD_VERBOSE} ? '' : '1>/dev/null 2>/dev/null'; @@ -90,7 +91,6 @@ sub __get_template_settings($$$) { $settings{CONFIGURE_DIRECTORY} = CONFIGURE_DIRECTORY; $settings{CONFIGURE_CACHE_FILE} = CONFIGURE_CACHE_FILE; $settings{SYSTEM_NAME} = lc $^O; - chomp($settings{SYSTEM_NAME_VERSION} = `uname -sr 2>/dev/null`); return %settings; } @@ -132,6 +132,9 @@ PATH OPTIONS --data-dir=[dir] The location where the data files, such as the pid file, are stored. [$PWD/run/data] + --example-dir=[dir] The location where the example configuration files + and SQL schemas are stored. + [$PWD/run/conf/examples] --log-dir=[dir] The location where the log files are stored. [$PWD/run/logs] --manual-dir=[dir] The location where the manual files are stored. @@ -154,6 +157,8 @@ MISC OPTIONS --clean Remove the configuration cache file and start the interactive configuration wizard. + --disable-auto-extras Disables automatically enabling extra modules + for which the dependencies are available. --disable-interactive Disables the interactive configuration wizard. --distribution-label=[text] Sets a distribution specific version label in the build configuration. @@ -202,7 +207,7 @@ sub test_file($$;$) { my ($compiler, $file, $args) = @_; my $status = 0; $args //= ''; - $status ||= system "$compiler -o __test_$file make/test/$file $args ${\CONFIGURE_ERROR_PIPE}"; + $status ||= system "$compiler -o __test_$file ${\CONFIGURE_ROOT}/make/test/$file $args ${\CONFIGURE_ERROR_PIPE}"; $status ||= system "./__test_$file ${\CONFIGURE_ERROR_PIPE}"; unlink "./__test_$file"; return !$status; @@ -231,7 +236,7 @@ sub write_configure_cache(%) { sub get_compiler_info($) { my $binary = shift; my %info = (NAME => 'Unknown', VERSION => '0.0'); - return %info if system "$binary -o __compiler_info make/test/compiler_info.cpp ${\CONFIGURE_ERROR_PIPE}"; + return %info if system "$binary -o __compiler_info ${\CONFIGURE_ROOT}/make/test/compiler_info.cpp ${\CONFIGURE_ERROR_PIPE}"; open(my $fh, '-|', './__compiler_info 2>/dev/null'); while (my $line = <$fh>) { $info{$1} = $2 if $line =~ /^([A-Z]+)\s(.+)$/;