X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=cfda1a241df2dbf40dc285f90baa01cdd2742776;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=4622d97039e656c913be98d218a73a91d62b2ba2;hpb=461127296029af6c438c1366a029911f1ae1f395;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/configure b/configure index 4622d9703..cfda1a241 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-2007 The InspIRCd Development Team -# http://www.inspircd.org/wiki/index.php/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,14 +33,7 @@ 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; use Getopt::Long; @@ -37,75 +44,18 @@ use make::configure; use make::gnutlscert; use make::opensslcert; -############################################################################################### -# -# EDITABLE VARIABLES -# -############################################################################################### - -# If you wish to ignore a dependency throughout the entire core, add it here. - -our @ignoredeps = ( - "inspircd_win32wrapper.h", # windows has its own configure program -); - -# If you wish for all files in the entire core to have a given dependency, insert it here. -# You should keep this to an absolute minimum to avoid rebuilds that are not neccessary. - -our @immutabledeps = ( - "inspircd_config.h", # auto re-generated by configure - "inspircd.h", -); - ############################################################################################### # # NON-EDITABLE VARIABLES # ############################################################################################### -# List of commands that make up 'make install' and 'make deinstall' - -our $install_list = ""; -our $uninstall_list = ""; - -# This is a list of all files in the core. Each cpp file is mapped to a shared object file, -# whos file extension is omitted (these can vary from system to system). Auto detected by -# scanning the src/*.cpp files for files containing /* $Core: */ identifiers. - -our %filelist = (); - -# If you wish for a file to have special dependencies in the makefile, add an entry here. -# Auto populated by /* $ExtraDeps: */ instruction - -our %specialdeps = (); - -# If you wish for a file to have extra make lines (in between the compile and link steps) -# then insert them here. -# Auto populated by /* $ExtraBuild: */ instruction - -our %extrabuildlines = (); - -# If you wish for a file to be linked against extra objects or arctives, insert them here. -# Auto populated by /* $ExtraObjects: */ instruction - -our %extraobjects = (); - -# If you wish to compile extra cpp sources into an object, define them here. -# NOTE: Certain cpp files such as the socket engines have a value auto calculated -# for this table so that their derived class is built. -# Auto populated by /* $ExtraSources: */ instruction - -our %extrasources = (); +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_system, $opt_uid); -our ($opt_use_gnutls, $opt_rebuild, $opt_use_openssl, $opt_nointeractive, $opt_nick_length, - $opt_chan_length, $opt_maxclients, $opt_ports, $opt_epoll, $opt_kqueue, $opt_noports, - $opt_noepoll, $opt_nokqueue, $opt_disablerpath, $opt_ipv6, $opt_ipv6links, - $opt_noipv6links, $opt_ident, $opt_quit, $opt_topic, $opt_maxbuf, $opt_kick, - $opt_gecos, $opt_away, $opt_modes, $opt_disable_debug, $opt_maxchans, - $opt_opermaxchans); - -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 (); @@ -119,45 +69,35 @@ 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, - 'with-nick-length=i' => \$opt_nick_length, - 'with-channel-length=i' => \$opt_chan_length, - 'with-max-clients=i' => \$opt_maxclients, 'enable-ports' => \$opt_ports, 'enable-epoll' => \$opt_epoll, 'enable-kqueue' => \$opt_kqueue, 'disable-ports' => \$opt_noports, 'disable-epoll' => \$opt_noepoll, 'disable-kqueue' => \$opt_nokqueue, - 'disable-rpath' => \$opt_disablerpath, - 'enable-ipv6' => \$opt_ipv6, - 'enable-remote-ipv6' => \$opt_ipv6links, - 'disable-remote-ipv6' => \$opt_noipv6links, + 'disable-ipv6' => \$opt_noipv6, 'with-cc=s' => \$opt_cc, - 'with-ident-length=i' => \$opt_ident, - 'with-quit-length=i' => \$opt_quit, - 'with-topic-length=i' => \$opt_topic, 'with-maxbuf=i' => \$opt_maxbuf, - 'with-kick-length=i' => \$opt_kick, - 'with-gecos-length=i' => \$opt_gecos, - 'with-away-length=i' => \$opt_away, - 'with-max-modes=i' => \$opt_modes, + 'enable-freebsd-ports-openssl' => \$opt_freebsd_port, 'prefix=s' => \$opt_base_dir, '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(); }, - 'modupdate' => sub { modupdate(); }, 'update' => sub { update(); }, - 'svnupdate' => sub { svnupdate(); }, 'clean' => sub { clean(); }, - 'update-root' => sub { update_root() }, 'list-extras' => sub { list_extras; exit 0; }, # This, --enable-extras, and --disable-extras are for non-interactive managing. 'enable-extras=s@' => \@opt_enableextras, # ^ 'disable-extras=s@' => \@opt_disableextras, # ^ + 'generate-openssl-cert' => sub { make_openssl_cert(); exit(0); }, + 'generate-gnutls-cert' => sub { make_gnutls_cert(); exit(0); } ); if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) { @@ -167,238 +107,185 @@ if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) { disable_extras(@opt_disableextras); list_extras; print "Remember: YOU are responsible for making sure any libraries needed have been installed!\n"; - print "Run $0 -modupdate after you've done this to update the makefiles.\n"; 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_away) || - (defined $opt_gecos) || - (defined $opt_kick) || - (defined $opt_maxclients) || - (defined $opt_modes) || - (defined $opt_topic) || - (defined $opt_quit) || - (defined $opt_ident) || (defined $opt_cc) || - (defined $opt_ipv6) || - (defined $opt_ipv6links) || - (defined $opt_noipv6links) || + (defined $opt_noipv6) || (defined $opt_kqueue) || (defined $opt_epoll) || (defined $opt_ports) || - (defined $opt_maxchans) || - (defined $opt_opermaxchans) || - (defined $opt_chan_length) || - (defined $opt_nick_length) || (defined $opt_use_openssl) || (defined $opt_nokqueue) || (defined $opt_noepoll) || (defined $opt_noports) || (defined $opt_maxbuf) || - (defined $opt_use_gnutls) + (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'; +} + +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 } -$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_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) +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`); # GNUTLS Version. + +if (defined $opt_freebsd_port) { - $config{LIBRARY_DIR} = $opt_library_dir; + chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`); + chomp($config{HAS_OPENSSL_PORT} = `pkg-config --modversion openssl 2>/dev/null`); + $config{USE_FREEBSD_BASE_SSL} = "n"; } -chomp($config{HAS_GNUTLS} = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version. -chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`); # Openssl version +else +{ + if ($^O eq "freebsd") + { + # default: use base ssl + chomp($config{HAS_OPENSSL} = `openssl version | cut -d ' ' -f 2`); # OpenSSL version, freebsd specific + chomp($config{HAS_OPENSSL_PORT} = `pkg-config --modversion openssl 2>/dev/null`); # Port version, may be different + } + 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{NICK_LENGT} = "31"; # Default Nick Length -if (defined $opt_nick_length) -{ - $config{NICK_LENGT} = $opt_nick_length; -} -$config{CHAN_LENGT} = "64"; # Default Channel Name Length -if (defined $opt_chan_length) -{ - $config{CHAN_LENGT} = $opt_chan_length; -} -$config{MAXI_MODES} = "20"; # Default Max. Number of Modes set at once. -if (defined $opt_modes) -{ - $config{MAXI_MODES} = $opt_modes; -} $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} = "n"; # IPv6 support (experimental) -if (defined $opt_ipv6) -{ - $config{IPV6} = "y"; -} -$config{SUPPORT_IP6LINKS} = "y"; # IPv4 supporting IPv6 links (experimental) -if (defined $opt_ipv6links) -{ - $config{SUPPORT_IP6LINKS} = "y"; -} -if (defined $opt_noipv6links) -{ - $config{SUPPORT_IP6LINKS} = "n"; -} -chomp($config{MAX_CLIENT_T} = `sh -c \"ulimit -n\"`); # FD Limit -chomp($config{MAX_DESCRIPTORS} = `sh -c \"ulimit -n\"`); # Hard FD Limit -chomp($config{GCCVER} = `g++ -dumpversion | cut -c 1`); # Major GCC Version $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; } our $exec = $config{CC} . " -dumpversion | cut -c 1"; chomp($config{GCCVER} = `$exec`); # Major GCC Version -$config{MAKEORDER} = "ircd mods"; # build order -$config{MAX_IDENT} = "12"; # max ident size -$config{MAX_QUIT} = "255"; # max quit message size -$config{MAX_TOPIC} = "307"; # max topic size -$config{MAX_KICK} = "255"; # max kick message size -$config{MAX_GECOS} = "128"; # max GECOS size -$config{MAX_AWAY} = "200"; # max AWAY size +$exec = $config{CC} . " -dumpversion | cut -c 3"; +chomp($config{GCCMINOR} = `$exec`); $config{MAXBUF} = "512"; # Max buffer size -if (defined $opt_ident) -{ - $config{MAX_IDENT} = $opt_ident; -} -if (defined $opt_quit) -{ - $config{MAX_QUIT} = $opt_quit; -} -if (defined $opt_topic) -{ - $config{MAX_TOPIC} = $opt_topic; -} -if (defined $opt_kick) -{ - $config{MAX_KICK} = $opt_kick; -} -if (defined $opt_gecos) -{ - $config{MAX_GECOS} = $opt_gecos; -} -if (defined $opt_away) -{ - $config{MAX_AWAY} = $opt_away; -} -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 "") { - print $config{CC} . " was not found! You require g++ (the GNU C++ compiler, part of GCC) to build InspIRCd!\n"; +if (($config{GCCVER} eq "") || ($config{GCCMINOR} eq "")) { + 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; } -our $fd_scan_fail = ""; -if (!$config{MAX_CLIENT_T}) { - $config{MAX_CLIENT_T} = 1024; # Set a reasonable 'Default' - $fd_scan_fail = "true"; # Used Later -} - # Get and Set some important vars.. getmodules(); @@ -409,42 +296,6 @@ sub clean our ($has_epoll, $has_ports, $has_kqueue) = (0, 0, 0); -sub update_root -{ - eval { - chomp($topdir = getcwd()); - $this = resolve_directory($topdir); # PWD, Regardless. - getmodules(); - # Does the cache file exist? - if (!getcache()) { - # No, No it doesn't.. *BASH* - print "You have not run ./configure before. Please do this before trying to run the update script.\n"; - exit 0; - } else { - print "Updating root files...\n"; - getosflags(); - if (defined($opt_disable_debug) && $opt_disable_debug == 1) - { - print "Disabling debug information (-g).\n"; - $config{OPTIMISATI} = ""; - getosflags(); - } - $has_epoll = $config{HAS_EPOLL}; - $has_ports = $config{HAS_PORTS}; - $has_kqueue = $config{HAS_KQUEUE}; - write_root_files(); - makecache(); - print "Complete.\n"; - exit 0; - } - }; - if ($@) - { - print "Configure update failed: $@\n"; - } - exit 1; -} - sub update { eval { @@ -459,12 +310,10 @@ sub update } else { # We've Loaded the cache file and all our variables.. print "Updating files...\n"; - getosflags(); if (defined($opt_disable_debug) && $opt_disable_debug == 1) { print "Disabling debug information (-g).\n"; $config{OPTIMISATI} = ""; - getosflags(); } $has_epoll = $config{HAS_EPOLL}; $has_ports = $config{HAS_PORTS}; @@ -482,76 +331,26 @@ sub update exit; } -sub modupdate -{ - eval { - chomp($topdir = getcwd()); - $this = resolve_directory($topdir); # PWD, Regardless. - getmodules(); - # Does the cache file exist? - if (!getcache()) { - # No, No it doesn't.. *BASH* - print "You have not run ./configure before. Please do this before trying to run the update script.\n"; - exit 0; - } else { - # We've Loaded the cache file and all our variables.. - print "Updating files...\n"; - getosflags(); - $has_epoll = $config{HAS_EPOLL}; - $has_ports = $config{HAS_PORTS}; - $has_kqueue = $config{HAS_KQUEUE}; - writefiles(0); - makecache(); - print "Complete.\n"; - exit; - } - }; - if ($@) - { - print "Module update failed: $@\n"; - } - exit; -} - - -sub svnupdate -{ +sub test_compile { + my $feature = shift; my $fail = 0; - open(FH,"<.svn/entries") or $fail = 1; - if ($fail) { - print "This is not an SVN copy of InspIRCd.\n"; - exit; - } - else - { - close(FH); - } - system("svn update"); - system("perl configure -update"); - if (defined $opt_rebuild) { - system("make install"); - } - exit; + $fail ||= system "$config{CC} -o test_$feature make/check_$feature.cpp >/dev/null 2>&1"; + $fail ||= system "./test_$feature"; + unlink "test_$feature"; + return !$fail; } print "Running non-interactive configure...\n" unless $interactive; print "Checking for cache from previous configure... "; -print ((!getcache()) ? "not found\n" : "found\n"); -print "Checking operating system version... "; -print getosflags() . "\n"; - -if (defined $opt_maxclients) -{ - $config{MAX_CLIENT} = $opt_maxclients; -} +print ($cache_loaded ? "found\n" : "not found\n"); +$config{SYSTEM} = lc $^O; +print "Checking operating system version... $config{SYSTEM}\n"; -if (!$config{MAX_CLIENT}) { - # If the cache hasn't set the max clients, copy the variable of MAX_CLIENT_T, this - # allows us to keep _T for testing purposes. (ie. "Are you sure you want to go - # higher than the found value" :)) - $config{MAX_CLIENT} = $config{MAX_CLIENT_T}; -} +$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"; @@ -600,69 +399,13 @@ if (!$fail) { print "yes\n" if $has_kqueue == 1; print "no\n" if $has_kqueue == 0; -printf "Checking if epoll exists... "; -$has_epoll = 0; -$fail = 0; -open(EPOLL, ")) - { - chomp($line); - if ($line =~ /GNU C Library .* version (.*?) /) - { - $libcv = $1; - $libcv =~ /(\d+\.\d+)/; - $libcv = $1; - } - elsif ($line =~ /Compiled on a Linux (.*?\..*?)\.* system/) - { - $kernelv = $1; - # Fix for some retarded libc builds, strip off >> and << etc. - $kernelv =~ /(\d+\.\d+)/; - $kernelv = $1; - } - } - close FH; - if ($libcv < 2.3) - { - $has_epoll = 0; - printf "libc too old: $libcv... "; - } - if ($kernelv < 2.6) - { - $has_epoll = 0; - printf "libc built against older kernel $kernelv... "; - } - } - } -} -print "yes\n" if $has_epoll == 1; -print "no\n" if $has_epoll == 0; +printf "Checking for epoll support... "; +$has_epoll = test_compile('epoll'); +print $has_epoll ? "yes\n" : "no\n"; + +printf "Checking for eventfd support... "; +$config{HAS_EVENTFD} = test_compile('eventfd') ? 'true' : 'false'; +print $config{HAS_EVENTFD} eq 'true' ? "yes\n" : "no\n"; printf "Checking if Solaris I/O completion ports are available... "; $has_ports = 0; @@ -681,12 +424,17 @@ print "yes\n" if $has_ports == 1; print "no\n" if $has_ports == 0; $config{HAS_EPOLL} = $has_epoll; -$config{HAS_KQUEUE} = $has_kqueue; +$config{HAS_KQUEUE} = $has_kqueue; printf "Checking for libgnutls... "; if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y"))) { - print "yes\n"; - $config{HAS_GNUTLS} = "y"; + if (defined($gnutls_ver) && ($gnutls_ver ne "")) { + print "yes\n"; + $config{HAS_GNUTLS} = "y"; + } else { + print "no\n"; + $config{HAS_GNUTLS} = "n"; + } } else { print "no\n"; $config{HAS_GNUTLS} = "n"; @@ -694,8 +442,13 @@ if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTL printf "Checking for openssl... "; if (defined($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL}) || ($config{HAS_OPENSSL} eq "y"))) { - print "yes\n"; - $config{HAS_OPENSSL} = "y"; + if (defined($openssl_ver) && ($openssl_ver ne "")) { + print "yes\n"; + $config{HAS_OPENSSL} = "y"; + } else { + print "no\n"; + $config{HAS_OPENSSL} = "n"; + } } else { print "no\n"; $config{HAS_OPENSSL} = "n"; @@ -707,27 +460,18 @@ if ($config{OSNAME} =~ /FreeBSD/i) my $version = `uname -r`; if ($version =~ /^4\./) { - my $foundit = `ls -l /usr/local/lib/libgnugetopt* | wc -l`; - if ($foundit > 0) - { - # ICKY ICKY ICK, FREEBSD 4.x! GET AN UPGRADE! - $config{CRAQ} = "-L/usr/local/lib -lgnugetopt -DHAVE_DECL_GETOPT=1"; - print "yes\n"; - } - else - { - print "\n\nERROR: You require libgnugetopt (from ports or packages) to build InspIRCd on FreeBSD 4.11.\n"; - } + 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 { - $config{CRAQ} = " "; print "no ($version)\n"; } } else { - $config{CRAQ} = " "; print "no ($config{OSNAME})\n"; } @@ -744,7 +488,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 *** @@ -756,7 +500,6 @@ a new value. Please note: You will \e[1mHAVE\e[0m to read the docs dir, otherwise you won't have a config file! Your operating system is: \e[1;32m$config{OSNAME}\e[0m ($wholeos) -Maximum file descriptors: \e[1;32m$config{MAX_CLIENT_T}\e[0m Your InspIRCd revision ID is \e[1;32mr$rev\e[0m STOP if ($rev eq "r0") { @@ -765,7 +508,7 @@ STOP print ".\n\n"; $config{CHANGE_COMPILER} = "n"; - print "I have detected the following compiler: \e[1;32m$config{CC}\e[0m (version \e[1;32m$config{GCCVER}.x\e[0m)\n"; + print "I have detected the following compiler: \e[1;32m$config{CC}\e[0m (version \e[1;32m$config{GCCVER}.$config{GCCMINOR}\e[0m)\n"; while (($config{GCCVER} < 3) || ($config{GCCVER} eq "")) { print "\e[1;32mIMPORTANT!\e[0m A GCC 2.x compiler has been detected, and @@ -781,7 +524,8 @@ should NOT be used. You should probably specify a newer compiler.\n\n"; chomp(my $foo = `$config{CC} -dumpversion | cut -c 1`); if ($foo ne "") { chomp($config{GCCVER} = `$config{CC} -dumpversion | cut -c 1`); # we must redo these if we change compilers - print "Queried compiler: \e[1;32m$config{CC}\e[0m (version \e[1;32m$config{GCCVER}.x\e[0m)\n"; + chomp($config{GCCMINOR} = `$config{CC} -dumpversion | cut -c 3`); + print "Queried compiler: \e[1;32m$config{CC}\e[0m (version \e[1;32m$config{GCCVER}.$config{GCCMINOR}\e[0m)\n"; if ($config{GCCVER} < 3) { print "\e[1;32mGCC 2.x WILL NOT WORK!\e[0m. Let's try that again, shall we?\n"; } @@ -800,122 +544,149 @@ 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?"); print "\n"; + if ($config{USE_KQUEUE} eq "y") { + $chose_hiperf = 1; + } } if ($has_epoll) { yesno('USE_EPOLL',"You are running a Linux 2.6+ operating system, and epoll\nwas detected. Would you like to enable epoll support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable epoll?"); print "\n"; + if ($config{USE_EPOLL} eq "y") { + $chose_hiperf = 1; + } } if ($has_ports) { yesno('USE_PORTS',"You are running Solaris 10.\nWould you like to enable I/O completion ports support?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable support for I/O completion ports?"); print "\n"; + if ($config{USE_PORTS} eq "y") { + $chose_hiperf = 1; + } } - my $chose_hiperf = (($config{USE_EPOLL} eq "y") || ($config{USE_KQUEUE} eq "y") || ($config{USE_PORTS} eq "y")); + if (!$chose_hiperf) { - print "No high-performance socket engines are available, or you chose\n"; - print "not to enable one. Defaulting to select() engine.\n\n"; + yesno('USE_POLL', "Would you like to use poll?\n This is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable poll?"); + if ($config{USE_POLL} ne "y") + { + print "No high-performance socket engines are available, or you chose\n"; + print "not to enable one. Defaulting to select() engine.\n\n"; + } } - yesno('IPV6',"Would you like to build InspIRCd with IPv6 support?"); - print "\n"; - - if ($config{IPV6} eq "y") { - print "You have chosen to build an \e[1;32mIPV6-enabled\e[0m server.\nTo accept IPV4 users, you can still use IPV4 addresses\nin your port bindings..\n\n"; - $config{SUPPORT_IP6LINKS} = "y"; - } else { - yesno('SUPPORT_IP6LINKS',"You have chosen to build an \e[1;32mIPV4-only\e[0m server.\nWould you like to enable support for linking to IPV6-enabled\nInspIRCd servers?\nIf you are using a recent operating\nsystem and are unsure, answer yes.\nIf you answer 'no' here, your InspIRCd server will be unable\nto parse IPV6 addresses (e.g. for CIDR bans)"); + $config{USE_FREEBSD_BASE_SSL} = "n"; + $config{USE_FREEBSD_PORTS_SSL} = "n"; + if ($config{HAS_OPENSSL_PORT} ne "") + { + $config{USE_FREEBSD_PORTS_SSL} = "y"; + print "I have detected the OpenSSL FreeBSD port installed on your system,\n"; + print "version \e[1;32m".$config{HAS_OPENSSL_PORT}."\e[0m. Your base system OpenSSL is version \e[1;32m".$openssl_ver."\e[0m.\n\n"; + yesno('USE_FREEBSD_PORTS_SSL', "Do you want to use the FreeBSD ports version?"); print "\n"; + $config{USE_FREEBSD_BASE_SSL} = "y" if ($config{USE_FREEBSD_PORTS_SSL} eq "n"); + + if ($config{USE_FREEBSD_BASE_SSL} eq "n") + { + # update to port version + $openssl_ver = $config{HAS_OPENSSL_PORT}; + } } + else + { + $config{USE_FREEBSD_BASE_SSL} = "y" if ($^O eq "freebsd"); + } + + $config{USE_SSL} ||= "n"; + $config{MODUPDATE} ||= 'n'; - if (($config{HAS_GNUTLS} eq "y") && ($config{HAS_OPENSSL} eq "y")) { - print "I have detected both \e[1;32mGnuTLS\e[0m and \e[1;32mOpenSSL\e[0m on your system.\n"; - print "I will default to GnuTLS. If you wish to use OpenSSL\n"; - print "instead, you should enable the OpenSSL module yourself\n"; - print "by copying it from src/modules/extra to src/modules.\n\n"; + if ($config{HAS_GNUTLS} eq "y" || $config{HAS_OPENSSL} eq "y") + { print "Detected GnuTLS version: \e[1;32m" . $gnutls_ver . "\e[0m\n"; print "Detected OpenSSL version: \e[1;32m" . $openssl_ver . "\e[0m\n\n"; - } - if ($config{HAS_GNUTLS} eq "y") { - yesno('USE_GNUTLS', "Would you like to enable SSL Support?"); - if ($config{USE_GNUTLS} eq "y") { - print "\nUsing GnuTLS SSL module.\n"; - } - } elsif ($config{HAS_OPENSSL} eq "y") { - yesno('USE_OPENSSL', "Would you like to enable SSL Support?"); - if ($config{USE_OPENSSL} eq "y") { - print "\nUsing OpenSSL SSL module.\nYou will get better performance if you move to GnuTLS in the future.\n"; + yesno('USE_SSL', "One or more SSL libraries detected. Would you like to enable SSL support?"); + if ($config{USE_SSL} eq "y") + { + if ($config{HAS_GNUTLS} eq "y") + { + yesno('USE_GNUTLS',"Would you like to enable SSL with m_ssl_gnutls? (recommended)"); + if ($config{USE_GNUTLS} eq "y") + { + print "\nUsing GnuTLS SSL module.\n"; + } + } + + if ($config{HAS_OPENSSL} eq "y") + { + yesno('USE_OPENSSL', "Would you like to enable SSL with m_ssl_openssl?"); + if ($config{USE_OPENSSL} eq "y") + { + print "\nUsing OpenSSL SSL module.\nYou will get better performance if you move to GnuTLS in the future.\n"; + } + } } } - else { - print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed if\nyou intend to use OpenSSL, or that GnuTLS is in your path if you intend\nto use GnuTLS.\n\n"; + else + { + print "\nCould not detect OpenSSL or GnuTLS. Make sure pkg-config is installed and\n"; + print "is in your path.\n\n"; } - print "\nThe following questions will ask you for various figures relating\n"; - print "To your IRCd install. Please note that these should usually be left\n"; - print "as defaults unless you have a real reason to change them. If they\n"; - print "changed, then the values must be identical on all servers on your\n"; - print "network, or malfunctions and/or crashes may occur, with the exception\n"; - print "of the 'maximum number of clients' setting which may be different on\n"; - print "different servers on the network.\n\n"; - - # File Descriptor Settings.. - promptnumeric("number of clients at any one time", "MAX_CLIENT_T"); - $config{MAX_CLIENT} = $config{MAX_CLIENT_T}; - $config{MAX_DESCRIPTORS} = $config{MAX_CLIENT_T}; - - promptnumeric("length of nicknames", "NICK_LENGT"); - promptnumeric("length of channel names", "CHAN_LENGT"); - promptnumeric("number of mode changes in one line", "MAXI_MODES"); - promptnumeric("length of an ident (username)", "MAX_IDENT"); - promptnumeric("length of a quit message", "MAX_QUIT"); - promptnumeric("length of a channel topic", "MAX_TOPIC"); - promptnumeric("length of a kick message", "MAX_KICK"); - promptnumeric("length of a GECOS (real name)", "MAX_GECOS"); - promptnumeric("length of an away message", "MAX_AWAY"); + 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 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") { print "Symlinking src/modules/m_ssl_gnutls.cpp from extra/\n"; symlink "extra/m_ssl_gnutls.cpp", "src/modules/m_ssl_gnutls.cpp" or print STDERR "Symlink failed: $!"; } - getmodules(); - if ($interactive) + 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) { @@ -928,27 +699,28 @@ if ($config{USE_GNUTLS} eq "y") { } } else { - print "SSL Certificates found, skipping.\n\n"; + print "SSL certificates found, skipping.\n\n"; } } else { print "Skipping SSL certificate generation\nin non-interactive mode.\n\n"; } -} elsif ($config{USE_OPENSSL} eq "y") { +} + +if ($config{USE_OPENSSL} eq "y") { unless (-r "src/modules/m_ssl_openssl.cpp") { print "Symlinking src/modules/m_ssl_openssl.cpp from extra/\n"; symlink "extra/m_ssl_openssl.cpp", "src/modules/m_ssl_openssl.cpp" or print STDERR "Symlink failed: $!"; } - getmodules(); $failed = 0; - if ($interactive) + 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... "; @@ -957,7 +729,7 @@ if ($config{USE_GNUTLS} 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 @@ -966,24 +738,24 @@ if ($config{USE_GNUTLS} 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"; } -getosflags(); +depcheck(); writefiles(1); makecache(); print "\n\n"; -print "To build your server with these settings, please type '\e[1;32m$config{MAKEPROG}\e[0m' now.\n"; +print "To build your server with these settings, please run '\e[1;32mmake\e[0m' now.\n"; 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 "\e[1;32mhttp://www.inspircd.org/wiki/Installation_From_Tarball\e[0m\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") { @@ -1045,8 +817,8 @@ sub dir_check { # Assume relative Path was given.. fill in the rest. $var = $this . "/$var"; } - - $var = resolve_directory($var); + + $var = resolve_directory($var); if (! -e $var) { print "$var does not exist. Create it?\n[\e[1;32my\e[0m] "; chomp(my $tmp = ); @@ -1083,170 +855,23 @@ sub dir_check { our $SHARED = ""; -sub getosflags { - - # Beware: Linux sets it's own cflags below for some retarded reason - $config{LDLIBS} = "-pthread -lstdc++"; - $config{FLAGS} = "-fPIC -Woverloaded-virtual -Wshadow -Wall $config{OPTIMISATI}"; - $config{DEVELOPER} = "-fPIC -Woverloaded-virtual -Wshadow -Wall -g"; - $SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared" unless defined $opt_disablerpath; - $config{MAKEPROG} = "make"; - - if ($config{OSNAME} =~ /darwin/i) { - $config{FLAGS} = "-DDARWIN -frtti -fPIC -Wall $config{OPTIMISATI}"; - $SHARED = "-bundle -twolevel_namespace -undefined dynamic_lookup"; - $config{LDLIBS} = "-ldl -pthread -lstdc++"; - } - - if ($config{OSNAME} =~ /OpenBSD/i) { - $config{MAKEPROG} = "gmake"; - $config{LDLIBS} = $config{LDLIBS} . " -lunwind"; - chomp(my $foo = `eg++ -dumpversion | cut -c 1`); - # theyre running the package version of gcc (eg++)... detect it and set up its version numbers. - # if theyre not running this, configure lets the build continue but they probably wont manage to - # compile as this standard version is 2.95.3! - if ($foo ne "") { - $config{CC} = "eg++"; - chomp($config{GCCVER} = `eg++ -dumpversion | cut -c 1`); # we must redo these if we change the compiler path - } - return "OpenBSD"; - } - - if ($config{OSNAME} =~ /Linux/i) { - $config{LDLIBS} = "-ldl -lstdc++ -pthread"; - $config{FLAGS} = "-fPIC -Woverloaded-virtual -Wshadow -Wall $config{OPTIMISATI}"; - $config{FLAGS} .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS}); - $config{LDLIBS} .= " " . $ENV{LDLIBS} if exists($ENV{LDLIBS}); - $config{MAKEPROG} = "make"; - } - - if ($config{OSNAME} =~ /FreeBSD/i) { - $config{FLAGS} .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS}); - $config{LDLIBS} .= " " . $ENV{LDLIBS} if exists($ENV{LDLIBS}); - } - - if ($config{OSNAME} =~ /SunOS/i or $config{OSNAME} =~ /solaris/i) - { - # solaris/sunos needs these - # socket = bsd sockets api - # nsl = dns stuff - # rt = POSIX realtime extensions - # resolv = inet_aton only (why isnt this in nsl?!) - $config{MAKEPROG} = "gmake"; - $config{LDLIBS} .= " -lsocket -lnsl -lrt -lresolv -pthread"; - return "Solaris"; - } - - if($config{OSNAME} =~ /MINGW32/i) - { - # All code is position-independent on windows - $config{FLAGS} =~ s/-fPIC //; - return "MinGW"; - } - - return $config{OSNAME}; -} - my ($mliflags, $mfrules, $mobjs, $mfcount) = ("", "", "", 0); -sub write_root_files { - # Create a Modules List.. - my $modules = ""; - foreach my $i (@modlist) - { - $modules .= "m_".$i.".so "; - } - chomp($modules); # Remove Redundant whitespace.. - - opendir(DIRHANDLE, "src/modules"); - foreach my $name (sort readdir(DIRHANDLE)) { - if ($name =~ /^m_(.+?)$/) { - if (defined(opendir(MDIRHANDLE, "src/modules/$name"))) { - closedir(MDIRHANDLE); - $modules .= "$name.so "; - $uninstall_list = $uninstall_list . " -rm \$(MODULES)/$name.so\n"; - } - } - } - closedir(DIRHANDLE); - - # Write all .in files. - my $exe = "inspircd"; - - # Do this once here, and cache it in the .*.inc files, - # rather than attempting to read src/version.sh from - # compiled code -- we might not have the source to hand. - # Fix for bug#177 by Brain. - - chomp(my $version = `sh ./src/version.sh`); - chomp(my $revision = getrevision()); - $version = "$version(r$revision)"; - - # We can actually parse any file starting with . and ending with .inc, - # but right now we only parse .inspircd.inc to form './inspircd' - - opendir(DIRHANDLE, $this); - - foreach my $name (sort readdir(DIRHANDLE)) { - if ($name =~ /^\.(.+)\.inc$/) { - my $file = $1; - - # Bug #353, omit this on non-darwin - next if (($config{OSNAME} !~ /darwin/) && ($file eq "org.inspircd.plist")); - - # All .name.inc files need parsing! - my $tmp = ""; - open(FILEHANDLE, ".$file.inc") or die ("Can't open .$file.inc"); - while () { - $tmp .= $_; - } - close(FILEHANDLE); - - print "Writing \e[1;32m$file\e[0m ...\n"; - $tmp =~ s/\@CC\@/$config{CC}/ if defined $config{CC}; - $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/ if defined $config{MAKEPROG}; - $tmp =~ s/\@FLAGS\@/$config{FLAGS}/ if defined $config{FLAGS}; - $tmp =~ s/\@DEVELOPER\@/$config{DEVELOPER}/ if defined $config{DEVELOPER}; - $tmp =~ s/\@LDLIBS\@/$config{LDLIBS}/ if defined $config{LDLIBS}; - $tmp =~ s/\@BASE_DIR\@/$config{BASE_DIR}/ if defined $config{BASE_DIR}; - $tmp =~ s/\@CONFIG_DIR\@/$config{CONFIG_DIR}/ if defined $config{CONFIG_DIR}; - $tmp =~ s/\@MODULE_DIR\@/$config{MODULE_DIR}/ if defined $config{MODULE_DIR}; - $tmp =~ s/\@BINARY_DIR\@/$config{BINARY_DIR}/ if defined $config{BINARY_DIR}; - $tmp =~ s/\@LIBRARY_DIR\@/$config{LIBRARY_DIR}/ if defined $config{LIBRARY_DIR}; - $tmp =~ s/\@MODULES\@/$modules/ if defined $modules; - $tmp =~ s/\@STARTSCRIPT\@/$config{STARTSCRIPT}/ if defined $config{STARTSCRIPT}; - $tmp =~ s/\@DESTINATION\@/$config{DESTINATION}/ if defined $config{DESTINATION}; - $tmp =~ s/\@EXTRA_DIR\@/$config{EXTRA_DIR}/ if defined $config{EXTRA_DIR}; - $tmp =~ s/\@EXECUTABLE\@/$exe/ if defined $exe; - $tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/ if defined $config{MAKEORDER}; - $tmp =~ s/\@VERSION\@/$version/ if defined $version; - $tmp =~ s/\@INSTALL_LIST\@/$install_list/ if defined $install_list; - $tmp =~ s/\@UNINSTALL_LIST\@/$uninstall_list/ if defined $uninstall_list; - - open(FILEHANDLE, ">$file"); - print FILEHANDLE $tmp; - } - } - closedir(DIRHANDLE); - - # Make inspircd executable! - chmod 0744, 'inspircd'; - -} - sub writefiles { my($writeheader) = @_; - my $se = ""; # First File.. inspircd_config.h 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"; - open(FILEHANDLE, ">include/inspircd_config.h"); - my $NL = $config{NICK_LENGT}+1; - my $CL = $config{CHAN_LENGT}+1; + open(FILEHANDLE, ">include/inspircd_config.h.tmp"); print FILEHANDLE <include/inspircd_se_config.h"); + open(FILEHANDLE, ">include/inspircd_version.h.tmp"); print FILEHANDLE <; + my $line2 = <$fh2>; + if (defined($line1) != defined($line2)) { + $diff = 1; + } elsif (!defined $line1) { + last; + } else { + $diff = ($line1 ne $line2); + } + } + if ($diff) { + unlink $file; + rename "$file.tmp", $file; + } else { + unlink "$file.tmp"; + } + } } - write_root_files(); - - print "Writing \e[1;32mMakefiles\e[0m\n"; - write_dynamic_modules_makefile(); - write_dynamic_makefile(); - -} - -sub write_dynamic_modules_makefile { - # Modules Makefile.. - print "Writing \e[1;32msrc/modules/Makefile\e[0m\n"; - open(FILEHANDLE, ">src/modules/Makefile"); - -### -# Module Makefile Header -### - print FILEHANDLE < -# for assisting with making this work right. -# -# Automatically Generated by ./configure to add a -# modules please run ./configure -modupdate -################################################### - -all: \$(MODULES) + # Write all .in files. + my $tmp = ""; + my $file = ""; + my $exe = "inspircd"; -EOF + # Do this once here, and cache it in the .*.inc files, + # rather than attempting to read src/version.sh from + # compiled code -- we might not have the source to hand. + # Fix for bug#177 by Brain. -if ($config{OSNAME} =~ /darwin/) { - print FILEHANDLE <; + close(FILEHANDLE); -EOCHEESE -} + $config{BUILD_DIR} ||= resolve_directory($config{ME}."/build"); - ### - # End Module Makefile Header - ### - - # Create a Modules List.. - my $modules = ""; - my $cmflags = ""; - my $liflags = ""; - foreach my $i (@modlist) { - ### - # Write Entry to the MakeFile - ### - $cmflags = getcompilerflags("src/modules/m_".$i.".cpp"); - $liflags = getlinkerflags("src/modules/m_".$i.".cpp"); - my $deps = getdependencies("src/modules/m_".$i.".cpp"); - - #print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n"; - - - if (nopedantic("src/modules/m_".$i.".cpp")) - { - print FILEHANDLE " -m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps - \@../../make/run-cc.pl \$(CC) -pipe -I../../include \$(NICEFLAGS) $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp -" - } - else - { - print FILEHANDLE " -m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps - \@../../make/run-cc.pl \$(CC) -pipe -I../../include \$(FLAGS) $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp -"; + for my $var (qw( + CC SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR DATA_DIR UID + STARTSCRIPT DESTINATION SOCKETENGINE + )) { + s/\@$var\@/$config{$var}/g; } - $install_list = $install_list . " install -m \$(INSTMODE) src/modules/m_$i.so \$(MODPATH)\n"; - $uninstall_list = $uninstall_list . " -rm \$(MODULES)/m_$i.so\n"; -### - # End Write Entry to the MakeFile - ### - } - - opendir(DIRHANDLE, "src/modules"); - foreach my $name (sort readdir(DIRHANDLE)) { - if ($name =~ /^m_(.+?)$/) { - $mfrules = ""; - $mobjs = ""; - $mliflags = ""; - $mfcount = 0; - # A module made of multiple files, in a dir, e.g. src/modules/m_spanningtree/ - if (defined(opendir(MDIRHANDLE, "src/modules/$name"))) { - read_module_directory("src/modules/$name", $name); - print "Composing Makefile rules for directory \e[1;32m$name\e[0m... (\e[1;32m$mfcount files found\e[0m)\n"; - print FILEHANDLE "$name.so: ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $mobjs\n"; - if ($config{IS_DARWIN} eq "YES") { - print FILEHANDLE " \@../../make/run-cc.pl \$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) $mliflags -bundle -o $name.so $mobjs\n"; - } else { - print FILEHANDLE " \@../../make/run-cc.pl \$(CC) -pipe \$(FLAGS) -shared $mliflags -o $name.so $mobjs\n"; - } - print FILEHANDLE "\n$mfrules\n"; - closedir(MDIRHANDLE); - $install_list = $install_list . " install -m \$(INSTMODE) src/modules/$name.so \$(MODPATH)\n"; - } + 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"; + open(FILEHANDLE, ">$file") or die("Can't write to $file: $!\n"); + print FILEHANDLE $_; + close(FILEHANDLE); } } - closedir(DIRHANDLE); -} -sub read_module_directory { - my ($dpath, $reldpath) = @_; - - if (opendir(MDIRHANDLE, $dpath) == 0) { - return; - } - - foreach my $fname (sort readdir(MDIRHANDLE)) { - if ($fname =~ /\.cpp$/) { - my $cmflags = getcompilerflags("$dpath/$fname"); - $mliflags = $mliflags . " " . getlinkerflags("$dpath/$fname"); - my $deps = getdependencies("$dpath/$fname"); - my $oname = $fname; - $oname =~ s/\.cpp$/.o/g; - $mfrules = $mfrules . "$reldpath/$oname: $reldpath/$fname ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps\n"; - $mfrules = $mfrules . " \@../../make/run-cc.pl \$(CC) -pipe -I../../include -I. \$(FLAGS) $cmflags -export-dynamic -o $reldpath/$oname -c $reldpath/$fname\n\n"; - $mobjs = $mobjs . " $reldpath/$oname"; - $mfcount++; - } - elsif ((-d "$dpath/$fname") && !($fname eq ".") && !($fname eq "..")) { - read_module_directory($dpath."/".$fname, $reldpath."/".$fname); - } - } + chmod 0755, 'inspircd'; } -sub calcdeps($) +sub depcheck { - # Yes i know we could use gcc -M but it seems to ideneify a lot of 'deep' - # dependencies which are not relevent in C++. - - my $file = $_[0]; - - open (CPP, "<$file") or die("Can't open $file for reading!"); - - my %dupe = (); - my $retlist = ""; - - foreach my $d (@ignoredeps) - { - $dupe{$d} = 1; - } - - my $immutable = ""; - foreach my $dep (@immutabledeps) - { - $immutable = $immutable . "../include/$dep "; - } - $immutable =~ s/ $//g; - - while (defined(my $line = )) - { - chomp($line); - if ($line =~ /#include "(.+\.h)"/) - { - if (!exists($dupe{$1})) - { - $retlist = $retlist . "../include/$1 "; - $dupe{$1} = 1; - } - } + getmodules(); + for my $mod (@modlist) { + getcompilerflags("src/modules/m_$mod.cpp"); + getlinkerflags("src/modules/m_$mod.cpp"); } - close CPP; - return length($immutable) ? $immutable . " " . $retlist : $retlist; } -sub write_dynamic_makefile +sub prepare_dynamic_makefile { my $i = 0; - my @cmdlist = (); - my %existing_install_list = (); - opendir(DIRHANDLE, "src/commands"); - foreach my $name (sort readdir(DIRHANDLE)) - { - if ($name =~ /^cmd_(.+)\.cpp$/) - { - $cmdlist[$i++] = $1; - $install_list = $install_list . " -install -m \$(INSTMODE) src/commands/cmd_" . $1 . ".so \$(LIBPATH)\n"; - $uninstall_list = $uninstall_list . " -rm \$(LIBPATH)/cmd_$1.so\n"; - } - } - closedir(DIRHANDLE); if (!$has_epoll) { @@ -1548,217 +1084,6 @@ sub write_dynamic_makefile { $config{USE_PORTS} = 0; } - - foreach my $dir (("src","src/commands","src/modes","src/socketengines","src/modules")) - { - print "Scanning \e[1;32m$dir\e[0m for core files "; - opendir(DIRHANDLE, $dir); - foreach my $name (sort readdir(DIRHANDLE)) - { - if ($name =~ /\.cpp$/) - { - open (CPP, "<$dir/$name") or die("Can't open $dir/$name to scan it! oh bugger"); - print "."; - while (defined(my $line = )) - { - chomp($line); - if ($line =~ /\/\* \$Core: (\w+) \*\//i) - { - $filelist{$name} = $1; - } - elsif ($line =~ /\/\* \$ExtraDeps: (.*?) \*\//i) - { - $specialdeps{$name} = $1; - } - elsif ($line =~ /\/\* \$ExtraObjects: (.*?) \*\//i) - { - $extraobjects{$name} = $1; - } - elsif ($line =~ /\/\* \$ExtraBuild: (.*?) \*\//i) - { - $extrabuildlines{$name} = $1; - } - elsif ($line =~ /\/\* \$ExtraSources: (.*?) \*\//i) - { - $extrasources{$name} = $1; - } - elsif ($line =~ /\/\* \$If: (\w+) \*\//i) - { - if (defined $config{$1}) - { - if (($config{$1} !~ /y/i) and ($config{$1} ne "1")) - { - # Skip to 'endif' - while (defined($line = )) - { - chomp($line); - die ("\$If buildsystem instruction within another \$If in file $dir/$name") if ($line =~ /\/\* \$If: (\w+) \*\//i); - last if ($line =~ /\/\* \$EndIf \*\//i); - } - } - } - } - elsif ($line =~ /\/\* \$Install: (.*?) \*\//i) - { - if (!exists($existing_install_list{$1})) - { - $existing_install_list{$1} = 1; - my $idir = (split(' ',$1))[1]; - my $ifile = (split(' ',$1))[0]; - $install_list = $install_list . " -install -m \$(INSTMODE) $1\n"; - $ifile =~ s/.*\///g; - $uninstall_list = $uninstall_list . " -rm $idir/$ifile\n"; - } - } - elsif ($line =~ /\/\* \$CopyInstall: (.*?) \*\//i) - { - if (!exists($existing_install_list{$1})) - { - $existing_install_list{$1} = 1; - my $idir = (split(' ',$1))[1]; - my $ifile = (split(' ',$1))[0]; - $install_list = $install_list . " -cp $1\n"; - $ifile =~ s/.*\///g; - $uninstall_list = $uninstall_list . " -rm $idir/$ifile\n"; - } - } - } - close CPP; - } - } - closedir(DIRHANDLE); - print " done!\n"; - } - - my $freebsd4libs = (defined $config{CRAQ} ? $config{CRAQ} : ""); - - my $all = "all: "; - my $all_libsonly = ""; - - my $libraryext = ""; - my $othercrap = ""; - my $RPATH = ""; - - if ($config{IS_DARWIN} eq "YES") - { - $libraryext = "dylib"; - $othercrap = " \@../make/run-cc.pl \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspircd.cpp\n \@../make/run-cc.pl \$(CC) -pipe -dynamic -bind_at_load -L. -o inspircd \$(LDLIBS) inspircd.o " - } - else - { - $libraryext = "so"; - $RPATH = "-Wl,--rpath -Wl,$config{LIBRARY_DIR}" unless defined $opt_disablerpath; - $othercrap = " \@../make/run-cc.pl \$(CC) -pipe -I../include $RPATH \$(FLAGS) $freebsd4libs -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) "; - } - - foreach my $cpp (sort keys %filelist) - { - $all = $all . $filelist{$cpp} . "." . $libraryext . " "; - $all_libsonly = $all_libsonly . $filelist{$cpp} . "." . $libraryext . " "; - $install_list = $install_list . " -install -m \$(INSTMODE) src/" . $filelist{$cpp} . "." . $libraryext . " \$(LIBPATH)\n"; - $uninstall_list = $uninstall_list . " -rm \$(LIBPATH)/" . $filelist{$cpp} . "." . $libraryext . "\n"; - } - $all = $all . "moo inspircd\n"; - - $othercrap = $othercrap . " $all_libsonly\n\n"; - - open(FH,">src/Makefile") or die("Could not write src/Makefile"); - print FH <src/commands/Makefile") or die("Could not write src/commands/Makefile"); - print FH <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