X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=1a4f03330f3d07c87208612ee276e7ebb0922135;hb=26e8190a3775bea8a3ef1b2c89184043394ea341;hp=d0c7d535640b3f3f89ace9c3e3a501740e0dcbb7;hpb=4564ed215cfde77e648a1aa8110ebe5de1252764;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/configure b/configure index d0c7d5356..1a4f03330 100755 --- a/configure +++ b/configure @@ -2,8 +2,8 @@ ################################################### # InspIRCd Configuration Script # -# Copyright 2002-2008 The InspIRCd Development Team -# http://www.inspircd.org/wiki/index.php/Credits +# Copyright 2002-2009 The InspIRCd Development Team +# http://wiki.inspircd.org/Credits # # Licensed under GPL, please see the COPYING file # for more information @@ -26,7 +26,6 @@ BEGIN { }; use File::Copy (); - use Socket; use Cwd; use Getopt::Long; @@ -70,7 +69,7 @@ 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. +# scanning the src/*.cpp files for files containing /* $Core */ identifiers. our %filelist = (); @@ -82,7 +81,7 @@ 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. @@ -97,12 +96,10 @@ our %extraobjects = (); our %extrasources = (); -our ($opt_use_gnutls, $opt_rebuild, $opt_use_openssl, $opt_nointeractive, $opt_nick_length, - $opt_chan_length, $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, $opt_freebsd_port); +our ($opt_use_gnutls, $opt_rebuild, $opt_use_openssl, $opt_nointeractive, $opt_ports, + $opt_epoll, $opt_kqueue, $opt_noports, $opt_noepoll, $opt_nokqueue, + $opt_ipv6, $opt_ipv6links, $opt_noipv6links, $opt_maxbuf, $opt_disable_debug, + $opt_freebsd_port); our ($opt_cc, $opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir, $opt_library_dir); @@ -121,27 +118,17 @@ GetOptions ( 'rebuild' => \$opt_rebuild, 'enable-openssl' => \$opt_use_openssl, 'disable-interactive' => \$opt_nointeractive, - 'with-nick-length=i' => \$opt_nick_length, - 'with-channel-length=i' => \$opt_chan_length, '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, '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, @@ -157,6 +144,8 @@ GetOptions ( '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) { @@ -178,13 +167,6 @@ our $non_interactive = ( (defined $opt_base_dir) || (defined $opt_binary_dir) || (defined $opt_nointeractive) || - (defined $opt_away) || - (defined $opt_gecos) || - (defined $opt_kick) || - (defined $opt_modes) || - (defined $opt_topic) || - (defined $opt_quit) || - (defined $opt_ident) || (defined $opt_cc) || (defined $opt_ipv6) || (defined $opt_ipv6links) || @@ -192,10 +174,6 @@ our $non_interactive = ( (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) || @@ -240,7 +218,7 @@ if (defined $opt_library_dir) { $config{LIBRARY_DIR} = $opt_library_dir; } -chomp($config{HAS_GNUTLS} = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version. +chomp($config{HAS_GNUTLS} = `pkg-config --modversion gnutls 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version. if (defined $opt_freebsd_port) { @@ -287,21 +265,6 @@ else $config{OPTIMISATI} = "-O2"; # DEBUGGING OFF! } -$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 @@ -313,6 +276,7 @@ if (defined $opt_nokqueue) { $config{USE_KQUEUE} = "n"; } +$config{USE_POLL} = "y"; # poll enabled $config{USE_EPOLL} = "y"; # epoll enabled if (defined $opt_epoll) { @@ -346,6 +310,7 @@ if (defined $opt_noipv6links) $config{SUPPORT_IP6LINKS} = "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? @@ -366,38 +331,9 @@ if (defined $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])?$/) { $config{HAS_OPENSSL} = $1; @@ -405,7 +341,7 @@ if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/) { $config{HAS_OPENSSL} = ""; } -if ($config{GCCVER} eq "") { +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"; exit; } @@ -594,6 +530,15 @@ sub svnupdate exit; } +sub test_compile { + my $feature = shift; + my $fail = 0; + $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"); @@ -647,69 +592,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; @@ -728,12 +617,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"; @@ -741,8 +635,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"; @@ -759,7 +658,7 @@ if ($config{OSNAME} =~ /FreeBSD/i) { # ICKY ICKY ICK, FREEBSD 4.x! GET AN UPGRADE! $config{CRAQ} = "-L/usr/local/lib -lgnugetopt -DHAVE_DECL_GETOPT=1"; - print "yes\n"; + print "yes (upgrade ffs, freebsd 4 is *way* out of date)\n"; } else { @@ -778,6 +677,9 @@ else print "no ($config{OSNAME})\n"; } +print "Checking for upgrades to extra and third party modules... "; +system "./modulemanager upgrade"; + ################################################################################ # BEGIN INTERACTIVE PART # ################################################################################ @@ -811,7 +713,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 @@ -827,7 +729,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"; } @@ -855,22 +758,36 @@ should NOT be used. You should probably specify a newer compiler.\n\n"; dir_check("is the IRCd binary to be placed", "BINARY_DIR"); dir_check("are the IRCd libraries to be placed", "LIBRARY_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?\n"); + 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?"); @@ -906,47 +823,40 @@ should NOT be used. You should probably specify a newer compiler.\n\n"; $config{USE_FREEBSD_BASE_SSL} = "y" if ($^O eq "freebsd"); } - 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"; + $config{USE_SSL} = "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"; - } - - 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"; - - 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"); + 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"; + } } dumphash(); @@ -963,13 +873,15 @@ if (($config{USE_OPENSSL} eq "y") && ($config{HAS_OPENSSL} ne "y")) } 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")); + 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 @@ -998,14 +910,15 @@ if ($config{USE_GNUTLS} eq "y") { { 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 @@ -1042,7 +955,7 @@ 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 "\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++")) { @@ -1108,8 +1021,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 = ); @@ -1150,20 +1063,21 @@ sub getosflags { # Beware: Linux sets it's own cflags below for some retarded reason $config{LDLIBS} = "-pthread -lstdc++"; - $config{FLAGS} = "-fPIC -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall $config{OPTIMISATI}"; - $config{DEVELOPER} = "-fPIC -Woverloaded-virtual -Wshadow -Wall -Wformat=2 -Wmissing-format-attribute -g"; - $SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared" unless defined $opt_disablerpath; + $config{FLAGS} = "-pipe -fPIC -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall $config{OPTIMISATI}"; + $config{DEVELOPER} = "-pipe -fPIC -Woverloaded-virtual -Wshadow -Wall -Wformat=2 -Wmissing-format-attribute -g"; + $SHARED = "-shared -export-dynamic"; $config{MAKEPROG} = "make"; if ($config{OSNAME} =~ /darwin/i) { - $config{FLAGS} = "-DDARWIN -frtti -fPIC -Wall $config{OPTIMISATI}"; + $config{FLAGS} = "-pipe -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"; +# apparantly (Dagonet says) that this causes problems, so let's try without it. +# $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 @@ -1171,6 +1085,7 @@ sub getosflags { if ($foo ne "") { $config{CC} = "eg++"; chomp($config{GCCVER} = `eg++ -dumpversion | cut -c 1`); # we must redo these if we change the compiler path + chomp($config{GCCMINOR} = `eg++ -dumpversion | cut -c 3`); } return "OpenBSD"; } @@ -1199,7 +1114,7 @@ sub getosflags { $config{LDLIBS} .= " -lsocket -lnsl -lrt -lresolv -pthread"; return "Solaris"; } - + if($config{OSNAME} =~ /MINGW32/i) { # All code is position-independent on windows @@ -1223,8 +1138,6 @@ sub writefiles { { 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; print FILEHANDLE <= 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"; } @@ -1276,6 +1188,9 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n"; if ($config{SUPPORT_IP6LINKS} =~ /y/i) { print FILEHANDLE "#define SUPPORT_IP6LINKS\n"; } + if ($config{HAS_EVENTFD} eq 'true') { + print FILEHANDLE "#define HAS_EVENTFD\n"; + } my $use_hiperf = 0; if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) { print FILEHANDLE "#define USE_KQUEUE\n"; @@ -1295,8 +1210,17 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n"; # user didn't choose either epoll or select for their OS. # default them to USE_SELECT (ewwy puke puke) if (!$use_hiperf) { - print FILEHANDLE "#define USE_SELECT\n"; - $se = "socketengine_select"; + print "no hi-perf, " . $config{USE_POLL}; + if ($config{USE_POLL} eq "y") + { + print FILEHANDLE "#define USE_POLL\n"; + $se = "socketengine_poll"; + } + else + { + print FILEHANDLE "#define USE_SELECT\n"; + $se = "socketengine_select"; + } } print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n\n#endif\n"; close(FILEHANDLE); @@ -1327,12 +1251,12 @@ EOF 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"))) { + foreach my $name2 (sort readdir(DIRHANDLE)) { + if ($name2 =~ /^m_(.+?)$/) { + if (defined(opendir(MDIRHANDLE, "src/modules/$name2"))) { closedir(MDIRHANDLE); - $modules .= "$name.so "; - $uninstall_list = $uninstall_list . " -rm \$(MODULES)/$name.so\n"; + $modules .= "$name2.so "; + $uninstall_list = $uninstall_list . " -rm \$(MODPATH)/$name2.so\n"; } } } @@ -1370,36 +1294,49 @@ EOF next if (($config{OSNAME} !~ /darwin/) && ($file eq "org.inspircd.plist")); # All .name.inc files need parsing! - $tmp = ""; open(FILEHANDLE, ".$file.inc") or die ("Can't open .$file.inc"); - while () { - $tmp .= $_; - } + $_ = join '', ; 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; + for my $var (qw( + CC FLAGS DEVELOPER LDLIBS BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR LIBRARY_DIR + STARTSCRIPT DESTINATION EXTRA_DIR + )) { + s/\@$var\@/$config{$var}/g; + } + s/\@MODULES\@/$modules/ if defined $modules; + s/\@EXECUTABLE\@/$exe/ if defined $exe; + s/\@VERSION\@/$version/ if defined $version; + s/\@INSTALL_LIST\@/$install_list/ if defined $install_list; + s/\@UNINSTALL_LIST\@/$uninstall_list/ if defined $uninstall_list; + + if ($file eq 'Makefile') { + my $mk_tmp = $_; + s/\@IFDEF (\S+)/ifdef $1/g; + s/\@IFNDEF (\S+)/ifndef $1/g; + s/\@ELSE/else/g; + s/\@ENDIF/endif/g; + s/\@BSD_ONLY .*\n//g; + s/\@GNU_ONLY //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/\@ELSE/.else/g; + s/\@ENDIF/.endif/g; + s/\@BSD_ONLY //g; + s/\@GNU_ONLY .*\n//g; + open MKF, '>BSDmakefile' or die "Can't write to BSDmakefile: $!"; + print MKF $_; + close MKF; + } else { + open(FILEHANDLE, ">$file") or die("Can't write to $file: $!\n"); + print FILEHANDLE $_; + close(FILEHANDLE); + } } } closedir(DIRHANDLE); @@ -1418,8 +1355,8 @@ sub write_dynamic_modules_makefile { ### print FILEHANDLE < # for assisting with making this work right. @@ -1461,27 +1398,27 @@ EOCHEESE $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 -" + \$(RUNCC) \$(NICEFLAGS) $cmflags \$(PICLDFLAGS) $liflags $SHARED -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 + \$(RUNCC) \$(FLAGS) $cmflags \$(PICLDFLAGS) $liflags $SHARED -o m_$i.so m_$i.cpp "; } $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 ### } @@ -1497,12 +1434,8 @@ m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/ch 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 "$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"; + print FILEHANDLE " \$(RUNCC) \$(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"; @@ -1514,11 +1447,11 @@ m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/ch 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"); @@ -1527,7 +1460,7 @@ sub read_module_directory { 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"; + $mfrules = $mfrules . " \$(RUNCC) -I. \$(FLAGS) $cmflags $SHARED -o $reldpath/$oname -c $reldpath/$fname\n\n"; $mobjs = $mobjs . " $reldpath/$oname"; $mfcount++; } @@ -1582,6 +1515,8 @@ sub write_dynamic_makefile my $i = 0; my @cmdlist = (); my %existing_install_list = (); + my %core_files_list = (); + opendir(DIRHANDLE, "src/commands"); foreach my $name (sort readdir(DIRHANDLE)) { @@ -1607,6 +1542,9 @@ sub write_dynamic_makefile $config{USE_PORTS} = 0; } + # formerly generated below this foreach, now it's not! magic. + my $all_core = ""; + foreach my $dir (("src","src/commands","src/modes","src/socketengines","src/modules")) { print "Scanning \e[1;32m$dir\e[0m for core files "; @@ -1620,9 +1558,20 @@ sub write_dynamic_makefile while (defined(my $line = )) { chomp($line); - if ($line =~ /\/\* \$Core: (\w+) \*\//i) + if ($line =~ /\/\* \$Core \*\//i) { - $filelist{$name} = $1; + my $sname = $name; + $sname =~ s/\.cpp$/.o/; + + # append it to list to be built + $all_core = $all_core . $sname . " "; + $filelist{$name} = $sname; + + # mark it as a core file, so it won't get shared object cflags + if (!exists($core_files_list{$name})) + { + $core_files_list{$name} = 1; + } } elsif ($line =~ /\/\* \$ExtraDeps: (.*?) \*\//i) { @@ -1688,83 +1637,56 @@ sub write_dynamic_makefile print " done!\n"; } + # modes need to be compiled in too + $all_core = $all_core . "modes/modeclasses.a"; + my $freebsd4libs = (defined $config{CRAQ} ? $config{CRAQ} : ""); - my $all = "all: "; - my $all_libsonly = ""; my $libraryext = ""; - my $othercrap = ""; - my $RPATH = ""; + my $binary_rule = ""; 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 " + $binary_rule = " \$(RUNCC) -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) "; + $binary_rule = " \$(RUNCC) \$(FLAGS) $freebsd4libs -rdynamic -L. -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 <