Switch <stdint.h> test to use a test file too.

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

diff --git a/make/configure.pm b/make/configure.pm
index b8e39598a35fb9ce34a494a3358565f798f6fc79..9b8e2d0e4b411f8c4174686d35565f5120168f94 100644 (file)
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -31,7 +31,7 @@ use warnings FATAL => qw(all);
 use Exporter 'import';
 use POSIX;
 use make::utilities;
-our @EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies nopedantic resolve_directory yesno showhelp promptstring_s);
+our @EXPORT = qw(promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies nopedantic resolve_directory yesno showhelp promptstring_s module_installed);
 
 my $no_git = 0;
 
@@ -81,7 +81,7 @@ sub getcompilerflags {
        my ($file) = @_;
        open(FLAGS, $file) or return "";
        while (<FLAGS>) {
-               if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) {
+               if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/\r?$/) {
                        my $x = translate_functions($1, $file);
                        next if ($x eq "");
                        close(FLAGS);
@@ -96,7 +96,7 @@ sub getlinkerflags {
        my ($file) = @_;
        open(FLAGS, $file) or return "";
        while (<FLAGS>) {
-               if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/$/) {
+               if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/\r?$/) {
                        my $x = translate_functions($1, $file);
                        next if ($x eq "");
                        close(FLAGS);
@@ -111,7 +111,7 @@ sub getdependencies {
        my ($file) = @_;
        open(FLAGS, $file) or return "";
        while (<FLAGS>) {
-               if ($_ =~ /^\/\* \$ModDep: (.+) \*\/$/) {
+               if ($_ =~ /^\/\* \$ModDep: (.+) \*\/\r?$/) {
                        my $x = translate_functions($1, $file);
                        next if ($x eq "");
                        close(FLAGS);
@@ -126,7 +126,7 @@ sub nopedantic {
        my ($file) = @_;
        open(FLAGS, $file) or return "";
        while (<FLAGS>) {
-               if ($_ =~ /^\/\* \$NoPedantic \*\/$/) {
+               if ($_ =~ /^\/\* \$NoPedantic \*\/\r?$/) {
                        my $x = translate_functions($_, $file);
                        next if ($x eq "");
                        close(FLAGS);
@@ -193,6 +193,13 @@ sub promptnumeric($$)
        }
 }
 
+sub module_installed($)
+{
+       my $module = shift;
+       eval("use $module;");
+       return !$@;
+}
+
 sub promptstring_s($$)
 {
        my ($prompt,$default) = @_;
@@ -269,7 +276,6 @@ InspIRCd 1.0.x, are also allowed.
                                to select() [not set]
   --disable-kqueue             Do not enable kqueue(), fall back
                                to select() [not set]
-  --disable-ipv6               Do not build IPv6 native InspIRCd [not set]
   --with-cc=[filename]         Use an alternative compiler to
                                build InspIRCd [g++]
   --with-maxbuf=[n]            Change the per message buffer size [512]
@@ -280,17 +286,16 @@ InspIRCd 1.0.x, are also allowed.
                                and library dirs as subdirectories of prefix)
                                [$PWD]
   --config-dir=[directory]     Config file directory for config and SSL certs
-                               [$PWD/conf]
+                               [$PWD/run/conf]
   --log-dir=[directory]               Log file directory for logs
-                              [$PWD/logs]
-  --data-dir=[directory]       Data directory for variable data, such as the permchannel configuration and the XLine database
-                              [$PWD/data]
+                               [$PWD/run/logs]
+  --data-dir=[directory]       Data directory for variable data, such as the
+                               permchannel configuration and the XLine database
+                               [$PWD/run/data]
   --module-dir=[directory]     Modules directory for loadable modules
-                               [$PWD/modules]
+                               [$PWD/run/modules]
   --binary-dir=[directory]     Binaries directory for core binary
-                               [$PWD/bin]
-  --library-dir=[directory]    Library directory for core libraries
-                               [$PWD/lib]
+                               [$PWD/run/bin]
   --list-extras                Show current status of extra modules
   --enable-extras=[extras]     Enable the specified list of extras
   --disable-extras=[extras]    Disable the specified list of extras