X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=fd00ff89c04ace244a996c09f27d0463a2f0fe0f;hb=4c751dbbe8945e5efc230a59b0ed51c2ba10cf92;hp=9795ec100cf630a35ccbdb13b7f5f2188d0fac34;hpb=1819d0109b0d3c3cf8c619849f8e67a9ffef57ab;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/configure b/configure index 9795ec100..fd00ff89c 100755 --- a/configure +++ b/configure @@ -1,16 +1,30 @@ -#!/usr/bin/perl -################################################### -# InspIRCd Configuration Script +#!/usr/bin/env perl + +# +# InspIRCd -- Internet Relay Chat Daemon # -# Copyright 2002-2009 The InspIRCd Development Team -# http://wiki.inspircd.org/Credits +# Copyright (C) 2009-2010 Daniel De Graaf +# Copyright (C) 2007, 2009 Dennis Friis +# Copyright (C) 2003, 2006-2008 Craig Edwards +# Copyright (C) 2006-2008 Robin Burchell +# Copyright (C) 2008 Thomas Stagner +# Copyright (C) 2007 John Brooks +# Copyright (C) 2006 Oliver Lupton +# Copyright (C) 2003-2006 Craig McLure # -# Licensed under GPL, please see the COPYING file -# for more information +# This file is part of InspIRCd. InspIRCd is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, version 2. # -# $Id$ +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. # -################################################### +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + BEGIN { require 5.8.0; @@ -19,12 +33,6 @@ BEGIN { use strict; use warnings FATAL => qw(all); -use Data::Dumper; -BEGIN { - $Data::Dumper::Sortkeys = 1; - $Data::Dumper::Useqq = 1; -}; - use File::Copy (); use Socket; use Cwd; @@ -44,10 +52,10 @@ use make::opensslcert; our ($opt_use_gnutls, $opt_rebuild, $opt_use_openssl, $opt_nointeractive, $opt_ports, $opt_epoll, $opt_kqueue, $opt_noports, $opt_noepoll, $opt_nokqueue, - $opt_noipv6, $opt_maxbuf, $opt_disable_debug, $opt_freebsd_port); + $opt_noipv6, $opt_maxbuf, $opt_disable_debug, $opt_freebsd_port, + $opt_system, $opt_uid); -our ($opt_cc, $opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir, - $opt_library_dir); +our ($opt_cc, $opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir, $opt_data_dir, $opt_log_dir); sub list_extras (); @@ -61,6 +69,8 @@ my @opt_disableextras; GetOptions ( 'enable-gnutls' => \$opt_use_gnutls, 'rebuild' => \$opt_rebuild, + 'system' => \$opt_system, + 'uid=s' => \$opt_uid, 'enable-openssl' => \$opt_use_openssl, 'disable-interactive' => \$opt_nointeractive, 'enable-ports' => \$opt_ports, @@ -77,11 +87,11 @@ GetOptions ( 'config-dir=s' => \$opt_config_dir, 'module-dir=s' => \$opt_module_dir, 'binary-dir=s' => \$opt_binary_dir, - 'library-dir=s' => \$opt_library_dir, + 'data-dir=s' => \$opt_data_dir, + 'log-dir=s' => \$opt_log_dir, 'disable-debuginfo' => sub { $opt_disable_debug = 1 }, 'help' => sub { showhelp(); }, 'update' => sub { update(); }, - 'svnupdate' => sub { svnupdate(); }, 'clean' => sub { clean(); }, 'list-extras' => sub { list_extras; exit 0; }, # This, --enable-extras, and --disable-extras are for non-interactive managing. 'enable-extras=s@' => \@opt_enableextras, # ^ @@ -100,13 +110,14 @@ if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) { exit 0; } -our $non_interactive = ( - (defined $opt_library_dir) || +our $interactive = !( (defined $opt_base_dir) || (defined $opt_config_dir) || (defined $opt_module_dir) || (defined $opt_base_dir) || (defined $opt_binary_dir) || + (defined $opt_data_dir) || + (defined $opt_log_dir) || (defined $opt_nointeractive) || (defined $opt_cc) || (defined $opt_noipv6) || @@ -118,46 +129,61 @@ our $non_interactive = ( (defined $opt_noepoll) || (defined $opt_noports) || (defined $opt_maxbuf) || + (defined $opt_system) || + (defined $opt_uid) || (defined $opt_use_gnutls) || (defined $opt_freebsd_port) ); -our $interactive = !$non_interactive; chomp(our $topdir = getcwd()); our $this = resolve_directory($topdir); # PWD, Regardless. our @modlist = (); # Declare for Module List.. our %config = (); # Initiate Configuration Hash.. -$config{ME} = resolve_directory($topdir); # Present Working Directory +our $cache_loaded = getcache(); +$config{ME} = resolve_directory($topdir); # Present Working Directory -$config{BASE_DIR} = $config{ME}; +$config{BASE_DIR} ||= $config{ME}."/run"; -if (defined $opt_base_dir) -{ +if (defined $opt_base_dir) { $config{BASE_DIR} = $opt_base_dir; +} elsif (defined $opt_system) { + $config{BASE_DIR} = '/var/lib/inspircd'; } -$config{CONFIG_DIR} = resolve_directory($config{BASE_DIR}."/conf"); # Configuration Directory -$config{MODULE_DIR} = resolve_directory($config{BASE_DIR}."/modules"); # Modules Directory -$config{BINARY_DIR} = resolve_directory($config{BASE_DIR}."/bin"); # Binary Directory -$config{LIBRARY_DIR} = resolve_directory($config{BASE_DIR}."/lib"); # Library Directory +if (defined $opt_system) { + $config{UID} = $opt_uid || 'ircd'; + $config{CONFIG_DIR} = '/etc/inspircd'; + $config{MODULE_DIR} = '/usr/lib/inspircd'; + $config{BINARY_DIR} = '/usr/sbin/'; + $config{BUILD_DIR} = resolve_directory($config{ME}."/build"); # Build Directory + $config{DATA_DIR} = '/var/inspircd'; + $config{LOG_DIR} = '/var/log/inspircd'; +} else { + $config{UID} = $opt_uid || $config{UID} || $<; + $config{CONFIG_DIR} ||= resolve_directory($config{BASE_DIR}."/conf"); # Configuration Directory + $config{MODULE_DIR} ||= resolve_directory($config{BASE_DIR}."/modules"); # Modules Directory + $config{BINARY_DIR} ||= resolve_directory($config{BASE_DIR}."/bin"); # Binary Directory + $config{BUILD_DIR} ||= resolve_directory($config{ME}."/build"); # Build Directory + $config{DATA_DIR} ||= resolve_directory($config{BASE_DIR}."/data"); # Data directory + $config{LOG_DIR} ||= resolve_directory($config{BASE_DIR}."/logs"); # Log directory +} -if (defined $opt_config_dir) -{ +if (defined $opt_config_dir) { $config{CONFIG_DIR} = $opt_config_dir; } -if (defined $opt_module_dir) -{ +if (defined $opt_module_dir) { $config{MODULE_DIR} = $opt_module_dir; } -if (defined $opt_binary_dir) -{ +if (defined $opt_binary_dir) { $config{BINARY_DIR} = $opt_binary_dir; } -if (defined $opt_library_dir) -{ - $config{LIBRARY_DIR} = $opt_library_dir; +if (defined $opt_data_dir) { + $config{DATA_DIR} = $opt_data_dir; +} +if (defined $opt_log_dir) { + $config{LOG_DIR} = $opt_log_dir; } -chomp($config{HAS_GNUTLS} = `pkg-config --modversion gnutls 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version. +chomp($config{HAS_GNUTLS} = `pkg-config --modversion gnutls 2>/dev/null`); # GNUTLS Version. if (defined $opt_freebsd_port) { @@ -177,84 +203,67 @@ else { chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`); # Openssl version, others $config{HAS_OPENSSL_PORT} = ""; + $config{USE_FREEBSD_BASE_SSL} = "n"; } } chomp(our $gnutls_ver = $config{HAS_GNUTLS}); chomp(our $openssl_ver = $config{HAS_OPENSSL}); -$config{USE_GNUTLS} = "n"; +$config{USE_GNUTLS} ||= "n"; if (defined $opt_use_gnutls) { $config{USE_GNUTLS} = "y"; # Use gnutls. } -$config{USE_OPENSSL} = "n"; # Use openssl. +$config{USE_OPENSSL} ||= "n"; # Use openssl. if (defined $opt_use_openssl) { $config{USE_OPENSSL} = "y"; } -# no, let's not change these. -$config{OPTIMITEMP} = "0"; # Default Optimisation Value -if (!defined $opt_disable_debug) -{ +if (!defined $opt_disable_debug) { $config{OPTIMISATI} = "-g1"; # Optimisation Flag -} -else -{ - $config{OPTIMISATI} = "-O2"; # DEBUGGING OFF! +} else { + $config{OPTIMISATI} = "-O2"; } $config{HAS_STRLCPY} = "false"; # strlcpy Check. $config{HAS_STDINT} = "false"; # stdint.h check $config{USE_KQUEUE} = "y"; # kqueue enabled -if (defined $opt_kqueue) -{ - $config{USE_KQUEUE} = "y"; -} -if (defined $opt_nokqueue) -{ +if (defined $opt_nokqueue) { $config{USE_KQUEUE} = "n"; } $config{USE_POLL} = "y"; # poll enabled $config{USE_EPOLL} = "y"; # epoll enabled -if (defined $opt_epoll) -{ - $config{USE_EPOLL} = "y"; -} if (defined $opt_noepoll) { $config{USE_EPOLL} = "n"; } $config{USE_PORTS} = "y"; # epoll enabled -if (defined $opt_ports) -{ - $config{USE_PORTS} = "y"; -} if (defined $opt_noports) { $config{USE_PORTS} = "n"; } -$config{IPV6} = "y"; # IPv6 support -if (defined $opt_noipv6) -{ - $config{IPV6} = "n"; -} -chomp($config{GCCVER} = `g++ -dumpversion | cut -c 1`); # Major GCC Version -chomp($config{GCCMINOR} = `g++ -dumpversion | cut -c 3`); $config{_SOMAXCONN} = SOMAXCONN; # Max connections in accept queue $config{OSNAME} = $^O; # Operating System Name $config{IS_DARWIN} = "NO"; # Is OSX? $config{STARTSCRIPT} = "inspircd"; # start script? $config{DESTINATION} = "BASE"; # Is target path. -$config{EXTRA_DIR} = ""; # Is empty. if ($config{OSNAME} =~ /darwin/i) { $config{IS_DARWIN} = "YES"; $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX. - $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target. - $config{EXTRA_DIR} = " launchd_dir"; # Is OSX specific path. + $config{CC} = "xcrun clang++"; # C++ compiler for OSX. +} +elsif ($config{OSNAME} =~ /freebsd/i) +{ + chomp(my $fbsd_version = `uname -r`); + $fbsd_version =~ s/^(\d+\.\d+).*/$1/g; + $config{CC} = $fbsd_version >= 10.0 ? 'clang++' : 'g++'; +} +else +{ + $config{CC} = "g++"; # C++ compiler } -$config{CC} = "g++"; # C++ compiler if (defined $opt_cc) { $config{CC} = $opt_cc; @@ -265,14 +274,15 @@ $exec = $config{CC} . " -dumpversion | cut -c 3"; chomp($config{GCCMINOR} = `$exec`); $config{MAXBUF} = "512"; # Max buffer size -if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/) { +if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)(?:[a-z])?(?:\-[a-z][0-9])?/) { $config{HAS_OPENSSL} = $1; } else { $config{HAS_OPENSSL} = ""; } if (($config{GCCVER} eq "") || ($config{GCCMINOR} eq "")) { - print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n"; + print "`$config{CC}` was not found! A C++ compiler is required to build InspIRCd!\n"; + print "You can pass a custom compiler to $0 using --with-cc=[name].\n"; exit; } @@ -321,84 +331,6 @@ sub update exit; } -sub svnupdate -{ - my $fail = 0; - open(FH,"<.svn/entries") or $fail = 1; - if ($fail) { - print "This is not an SVN copy of InspIRCd.\n"; - exit 1; - } - else - { - close(FH); - } - open my $fd, "-|", "svn update"; - my $configurechanged = 0; # Needs ./configure -update - my $rootincchanged = 0; - my @conflicted = (); - while (defined(my $line = <$fd>)) - { - my ($action, $file); - print $line; - $line =~ m/^([ADUCG])\s+(.*)$/ or next; - ($action, $file) = ($1, $2); - if ($action eq "C") - { - push @conflicted, $file; - if ($file eq "configure") - { - $configurechanged = 1; - } - elsif ($file =~ m/^\..*\.inc$/) - { - $rootincchanged = 1; - } - } - elsif ($action eq "U" || $action eq "G") - { - if ($file eq "configure") - { - $configurechanged = 1; - } - elsif ($file =~ m/^\..*\.inc$/) - { - $rootincchanged = 1; - } - } - } - unless (close $fd) # close() waits for exit and returns false if the command failed - { - if ($! == 0) - { - print STDERR "Problem updating from SVN, please check above for errors\n"; - } - else - { - print STDERR "Failed to run SVN: $!\n"; - } - exit 1; - } - if (scalar(@conflicted) > 0) - { - print STDERR "\e[0;33;1mERROR:\e[0m You have local modifications which conflicted with the updates from SVN\n"; - print STDERR "Configure is not able to complete the update. Please resolve these conflicts, then run ./configure -update\n"; - print "Conflicted files: " . join ", ", @conflicted . "\n"; - exit 1; - } - if ($configurechanged) - { - system("perl configure -update"); - } - else - { - print "No need to update Makefiles.\n"; - } - if (defined $opt_rebuild) { - system("make install"); - } - exit; -} sub test_compile { my $feature = shift; @@ -411,56 +343,26 @@ sub test_compile { print "Running non-interactive configure...\n" unless $interactive; print "Checking for cache from previous configure... "; -print ((!getcache()) ? "not found\n" : "found\n"); +print ($cache_loaded ? "found\n" : "not found\n"); $config{SYSTEM} = lc $^O; print "Checking operating system version... $config{SYSTEM}\n"; +$exec = $config{CC} . " -dumpversion | cut -c 1"; +chomp($config{GCCVER} = `$exec`); # Major GCC Version +$exec = $config{CC} . " -dumpversion | cut -c 3"; +chomp($config{GCCMINOR} = `$exec`); + printf "Checking if stdint.h exists... "; -$config{HAS_STDINT} = "true"; -our $fail = 0; -open(STDINT, ")) { - chomp($line); - # try and find the delcaration of: - # size_t strlcpy(...) - if ($line =~ /size_t(\0x9|\s)+strlcpy/) { - $config{HAS_STRLCPY} = "true"; - } - } - close(STRLCPY); -} -print "yes\n" if $config{HAS_STRLCPY} eq "true"; -print "no\n" if $config{HAS_STRLCPY} eq "false"; +$config{HAS_STRLCPY} = test_compile('strlcpy'); +print $config{HAS_STRLCPY} ? "yes\n" : "no\n"; printf "Checking if kqueue exists... "; -$has_kqueue = 0; -$fail = 0; -open(KQUEUE, ")) { - chomp($line); - # try and find the delcaration of: - # int kqueue(void); - if ($line =~ /int(\0x9|\s)+kqueue/) { - $has_kqueue = 1; - } - } - close(KQUEUE); -} -print "yes\n" if $has_kqueue == 1; -print "no\n" if $has_kqueue == 0; +$has_kqueue = test_compile('kqueue'); +print $has_kqueue ? "yes\n" : "no\n"; printf "Checking for epoll support... "; $has_epoll = test_compile('epoll'); @@ -523,8 +425,10 @@ if ($config{OSNAME} =~ /FreeBSD/i) my $version = `uname -r`; if ($version =~ /^4\./) { - print "yes\n"; - exit 1; + print "yes.\n"; + print "FreeBSD 4.x is no longer supported. By ANYONE.\n"; + print "To build, you will need to add the following to CXXFLAGS:\n"; + print "\t-L/usr/local/lib -lgnugetopt -DHAVE_DECL_GETOPT=1\n"; } else { @@ -536,9 +440,6 @@ else print "no ($config{OSNAME})\n"; } -print "Checking for upgrades to extra and third party modules... "; -system "./modulemanager upgrade"; - ################################################################################ # BEGIN INTERACTIVE PART # ################################################################################ @@ -552,7 +453,7 @@ if ($interactive) my $rev = getrevision(); # Display Introduction Message.. print <<"STOP" ; -Welcome to the \e[1mInspIRCd\e[0m Configuration program! (\e[1minteractive mode\e[0m) +Welcome to the \e[1mInspIRCd\e[0m configuration program! (\e[1minteractive mode\e[0m) \e[1mPackage maintainers: Type ./configure --help for non-interactive help\e[0m *** If you are unsure of any of these values, leave it blank for *** @@ -608,15 +509,18 @@ should NOT be used. You should probably specify a newer compiler.\n\n"; if ($tmpbase ne $config{BASE_DIR}) { $config{CONFIG_DIR} = resolve_directory($config{BASE_DIR}."/conf"); # Configuration Dir $config{MODULE_DIR} = resolve_directory($config{BASE_DIR}."/modules"); # Modules Directory + $config{DATA_DIR} = resolve_directory($config{BASE_DIR}."/data"); # Data Directory + $config{LOG_DIR} = resolve_directory($config{BASE_DIR}."/logs"); # Log Directory $config{BINARY_DIR} = resolve_directory($config{BASE_DIR}."/bin"); # Binary Directory - $config{LIBRARY_DIR} = resolve_directory($config{BASE_DIR}."/lib"); # Library Directory } dir_check("are the configuration files", "CONFIG_DIR"); dir_check("are the modules to be compiled to", "MODULE_DIR"); dir_check("is the IRCd binary to be placed", "BINARY_DIR"); - dir_check("are the IRCd libraries to be placed", "LIBRARY_DIR"); - + dir_check("are variable data files to be located in", "DATA_DIR"); + dir_check("are the logs to be stored in", "LOG_DIR"); + dir_check("do you want the build to take place", "BUILD_DIR"); + my $chose_hiperf = 0; if ($has_kqueue) { yesno('USE_KQUEUE',"You are running a BSD operating system, and kqueue\nwas detected. Would you like to enable kqueue support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable kqueue?"); @@ -649,9 +553,6 @@ should NOT be used. You should probably specify a newer compiler.\n\n"; } } - yesno('IPV6',"Would you like to build InspIRCd with IPv6 support?\nYou can still use IPv4 addresses in your port bindings.\n\nEnable IPv6?"); - print "\n"; - $config{USE_FREEBSD_BASE_SSL} = "n"; $config{USE_FREEBSD_PORTS_SSL} = "n"; if ($config{HAS_OPENSSL_PORT} ne "") @@ -674,7 +575,8 @@ should NOT be used. You should probably specify a newer compiler.\n\n"; $config{USE_FREEBSD_BASE_SSL} = "y" if ($^O eq "freebsd"); } - $config{USE_SSL} = "n"; + $config{USE_SSL} ||= "n"; + $config{MODUPDATE} ||= 'n'; if ($config{HAS_GNUTLS} eq "y" || $config{HAS_OPENSSL} eq "y") { @@ -705,27 +607,37 @@ should NOT be used. You should probably specify a newer compiler.\n\n"; } else { - print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed if\n"; - print "you intend to use OpenSSL, or that GnuTLS is in your path if you intend\nto use GnuTLS.\n\n"; + print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed and\n"; + print "is in your path.\n\n"; + } + + yesno('MODUPDATE',"Would you like to check for updates to third-party modules?"); + print "\n"; + if ($config{MODUPDATE} eq "y") { + print "Checking for upgrades to extra and third-party modules... "; + system "./modulemanager upgrade"; } } +# We are on a POSIX system, we can enable POSIX extras without asking +symlink "extra/m_regex_posix.cpp", "src/modules/m_regex_posix.cpp"; + dumphash(); if (($config{USE_GNUTLS} eq "y") && ($config{HAS_GNUTLS} ne "y")) { - print "Sorry, but i couldn't detect gnutls. Make sure gnutls-config is in your path.\n"; + print "Sorry, but I couldn't detect GnuTLS. Make sure pkg-config is in your path.\n"; exit(0); } if (($config{USE_OPENSSL} eq "y") && ($config{HAS_OPENSSL} ne "y")) { - print "Sorry, but i couldn't detect openssl. Make sure openssl is in your path.\n"; + print "Sorry, but I couldn't detect OpenSSL. Make sure pkg-config and openssl are in your path.\n"; exit(0); } our $failed = 0; $config{CERTGEN} ||= 'y'; -yesno('CERTGEN',"Would you like generate SSL certificates now?") if ($interactive && ($config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y")); +yesno('CERTGEN',"Would you like to generate SSL certificates now?") if ($interactive && ($config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y")); if ($config{USE_GNUTLS} eq "y") { unless (-r "src/modules/m_ssl_gnutls.cpp") { @@ -735,13 +647,11 @@ if ($config{USE_GNUTLS} eq "y") { if ($interactive && $config{CERTGEN} eq 'y') { unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem") { - print "SSL Certificates Not found, Generating.. \n\n + print "SSL certificates not found, generating.. \n\n ************************************************************* -* Generating the Private Key may take some time, go grab a * -* Coffee. Even better, to generate some more entropy if it * -* is taking a while, open another console and type du / a * -* few times and get that HD going :) Then answer the * -* Questions which follow. If you are unsure, just hit enter * +* Generating the private key may take some time, once done, * +* answer the questions which follow. If you are unsure, * +* just hit enter! * *************************************************************\n\n"; $failed = make_gnutls_cert(); if ($failed) { @@ -754,7 +664,7 @@ if ($config{USE_GNUTLS} eq "y") { } } else { - print "SSL Certificates found, skipping.\n\n"; + print "SSL certificates found, skipping.\n\n"; } } else @@ -772,10 +682,10 @@ if ($config{USE_OPENSSL} eq "y") { if ($interactive && $config{CERTGEN} eq 'y') { unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem") { - print "SSL Certificates Not found, Generating.. \n\n + print "SSL certificates not found, generating.. \n\n ************************************************************* * Generating the certificates may take some time, go grab a * -* coffee, or something. * +* coffee or something. * *************************************************************\n\n"; make_openssl_cert(); print "\nCertificate generation complete, copying to config directory... "; @@ -784,7 +694,7 @@ if ($config{USE_OPENSSL} eq "y") { File::Copy::move("dhparams.pem", "$config{CONFIG_DIR}/dhparams.pem") or print STDERR "Could not copy dhparams.pem!\n"; print "Done.\n\n"; } else { - print "SSL Certificates found, skipping.\n\n" + print "SSL certificates found, skipping.\n\n" } } else @@ -793,7 +703,7 @@ if ($config{USE_OPENSSL} eq "y") { } } if (($config{USE_GNUTLS} eq "n") && ($config{USE_OPENSSL} eq "n")) { - print "Skipping SSL Certificate generation, SSL support is not available.\n\n"; + print "Skipping SSL certificate generation as SSL support is not available.\n\n"; } depcheck(); @@ -805,12 +715,12 @@ print "To build your server with these settings, please run '\e[1;32mmake\e[0m' if (($config{USE_GNUTLS} eq "y") || ($config{USE_OPENSSL} eq "y")) { print "Please note: for \e[1;32mSSL support\e[0m you will need to load required\n"; print "modules in your config. This configure script has added those modules to the\n"; - print "build process. For more info please refer to:\n"; + print "build process. For more info, please refer to:\n"; print "\e[1;32mhttp://wiki.inspircd.org/Installation_From_Tarball\e[0m\n"; } print "*** \e[1;32mRemember to edit your configuration files!!!\e[0m ***\n\n\n"; if (($config{OSNAME} eq "OpenBSD") && ($config{CC} ne "eg++")) { - print "\e[1;32mWARNING!\e[0m You are running OpenBSD but you are using the base gcc package\nrather than eg++. This compile will most likely fail, but i'm letting you\ngo ahead with it anyway, just in case i'm wrong :-)\n"; + print "\e[1;32mWARNING!\e[0m You are running OpenBSD but you are using the base gcc package\nrather than eg++. This compile will most likely fail, but I'm letting you\ngo ahead with it anyway, just in case I'm wrong :-)\n"; } if ($config{GCCVER} < "3") { @@ -918,6 +828,11 @@ sub writefiles { chomp(my $incos = `uname -n -s -r`); chomp(my $version = `sh src/version.sh`); chomp(my $revision2 = getrevision()); + my $branch = "InspIRCd-0.0"; + if ($version =~ /^(InspIRCd-[0-9]+\.[0-9]+)\.[0-9]+/) + { + $branch = $1; + } if ($writeheader == 1) { print "Writing \e[1;32minspircd_config.h\e[0m\n"; @@ -931,11 +846,11 @@ sub writefiles { #define CoreExport /**/ #define DllExport /**/ -#define CONFIG_FILE "$config{CONFIG_DIR}/inspircd.conf" +#define CONFIG_PATH "$config{CONFIG_DIR}" +#define DATA_PATH "$config{DATA_DIR}" +#define LOG_PATH "$config{LOG_DIR}" #define MOD_PATH "$config{MODULE_DIR}" #define SOMAXCONN_S "$config{_SOMAXCONN}" -#define OPTIMISATION $config{OPTIMITEMP} -#define LIBRARYDIR "$config{LIBRARY_DIR}" #define ENTRYPOINT int main(int argc, char** argv) EOF @@ -950,25 +865,18 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n"; if ($config{GCCVER} >= 3) { print FILEHANDLE "#define GCC3\n"; } - if ( - (($config{GCCVER} == 4) && ($config{GCCMINOR} >= 3)) - || - ($config{GCCVER} > 4) - ) { - print FILEHANDLE "#define HASHMAP_DEPRECATED\n"; - } if ($config{HAS_STRLCPY} eq "true") { print FILEHANDLE "#define HAS_STRLCPY\n"; } if ($config{HAS_STDINT} eq "true") { print FILEHANDLE "#define HAS_STDINT\n"; } - if ($config{IPV6} =~ /y/i) { - print FILEHANDLE "#define IPV6\n"; - } if ($config{HAS_EVENTFD} eq 'true') { print FILEHANDLE "#define HAS_EVENTFD\n"; } + if ($config{OSNAME} !~ /DARWIN/i) { + print FILEHANDLE "#define HAS_CLOCK_GETTIME\n"; + } my $use_hiperf = 0; if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) { print FILEHANDLE "#define USE_KQUEUE\n"; @@ -1003,27 +911,16 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n"; print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n\n#endif\n"; close(FILEHANDLE); - open(FILEHANDLE, ">include/inspircd_se_config.h.tmp"); - print FILEHANDLE <include/inspircd_version.h.tmp"); print FILEHANDLE <; + close(FILEHANDLE); - # All .name.inc files need parsing! - open(FILEHANDLE, ".$file.inc") or die ("Can't open .$file.inc"); - $_ = join '', ; - close(FILEHANDLE); + $config{BUILD_DIR} ||= resolve_directory($config{ME}."/build"); + for my $var (qw( + CC SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR DATA_DIR UID + STARTSCRIPT DESTINATION SOCKETENGINE LOG_DIR + )) { + s/\@$var\@/$config{$var}/g; + } + s/\@EXECUTABLE\@/$exe/ if defined $exe; + s/\@VERSION\@/$version/ if defined $version; + + if ($file eq 'main.mk') { + print "Writing \e[1;32mGNUmakefile\e[0m ...\n"; + + my $mk_tmp = $_; + s/\@IFDEF (\S+)/ifdef $1/g; + s/\@IFNDEF (\S+)/ifndef $1/g; + s/\@IFEQ (\S+) (\S+)/ifeq ($1,$2)/g; + s/\@ELSIFEQ (\S+) (\S+)/else ifeq ($1,$2)/g; + s/\@ELSE/else/g; + s/\@ENDIF/endif/g; + s/ *\@BSD_ONLY .*\n//g; + s/\@GNU_ONLY //g; + s/\@DO_EXPORT (.*)/export $1/g; + open MKF, '>GNUmakefile' or die "Can't write to GNUmakefile: $!"; + print MKF $_; + close MKF; + + print "Writing \e[1;32mBSDmakefile\e[0m ...\n"; + $_ = $mk_tmp; + s/\@IFDEF (\S+)/.if defined($1)/g; + s/\@IFNDEF (\S+)/.if !defined($1)/g; + s/\@IFEQ (\S+) (\S+)/.if $1 == $2/g; + s/\@ELSIFEQ (\S+) (\S+)/.elif $1 == $2/g; + s/\@ELSE/.else/g; + s/\@ENDIF/.endif/g; + s/\@BSD_ONLY //g; + s/ *\@GNU_ONLY .*\n//g; + $mk_tmp = $_; + $mk_tmp =~ s#\@DO_EXPORT (.*)#"MAKEENV += ".join ' ', map "$_='\${$_}'", split /\s/, $1#eg; + open MKF, '>BSDmakefile' or die "Can't write to BSDmakefile: $!"; + print MKF $mk_tmp; + close MKF; + } else { print "Writing \e[1;32m$file\e[0m ...\n"; - for my $var (qw( - CC SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR LIBRARY_DIR - STARTSCRIPT DESTINATION EXTRA_DIR SOCKETENGINE CORE_FLAGS - )) { - s/\@$var\@/$config{$var}/g; - } - s/\@EXECUTABLE\@/$exe/ if defined $exe; - s/\@VERSION\@/$version/ if defined $version; - - if ($file eq 'Makefile') { - my $mk_tmp = $_; - s/\@IFDEF (\S+)/ifdef $1/g; - s/\@IFNDEF (\S+)/ifndef $1/g; - s/\@IFEQ (\S+) (\S+)/ifeq ($1,$2)/g; - s/\@ELSIFEQ (\S+) (\S+)/else ifeq ($1,$2)/g; - s/\@ELSE/else/g; - s/\@ENDIF/endif/g; - s/ *\@BSD_ONLY .*\n//g; - s/\@GNU_ONLY //g; - s/\@DO_EXPORT (.*)/export $1/g; - open MKF, '>GNUmakefile' or die "Can't write to GNUmakefile: $!"; - print MKF $_; - close MKF; - $_ = $mk_tmp; - s/\@IFDEF (\S+)/.if defined($1)/g; - s/\@IFNDEF (\S+)/.if !defined($1)/g; - s/\@IFEQ (\S+) (\S+)/.if $1 == $2/g; - s/\@ELSIFEQ (\S+) (\S+)/.elif $1 == $2/g; - s/\@ELSE/.else/g; - s/\@ENDIF/.endif/g; - s/\@BSD_ONLY //g; - s/ *\@GNU_ONLY .*\n//g; - $mk_tmp = $_; - $mk_tmp =~ s#\@DO_EXPORT (.*)#"MAKEENV += ".join ' ', map "$_='\${$_}'", split /\s/, $1#eg; - open MKF, '>BSDmakefile' or die "Can't write to BSDmakefile: $!"; - print MKF $mk_tmp; - close MKF; - } else { - open(FILEHANDLE, ">$file") or die("Can't write to $file: $!\n"); - print FILEHANDLE $_; - close(FILEHANDLE); - } + open(FILEHANDLE, ">$file") or die("Can't write to $file: $!\n"); + print FILEHANDLE $_; + close(FILEHANDLE); } } - closedir(DIRHANDLE); - # Make inspircd executable! - chmod 0744, 'inspircd'; + chmod 0755, 'inspircd'; } sub depcheck @@ -1183,7 +1075,6 @@ sub list_extras () { my %extras = (); EXTRA: for my $extra (@extras) { next if (File::Spec->curdir() eq $extra || File::Spec->updir() eq $extra); - next if ($extra eq '.svn'); my $abs_extra = File::Spec->catfile($abs_srcdir, "extra", $extra); my $abs_source = File::Spec->catfile($abs_srcdir, $extra); next unless ($extra =~ m/\.(cpp|h)$/ || (-d $abs_extra)); # C++ Source/Header, or directory