X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=45bb0e911f68f65d20bab8b39ebbe6f513a52880;hb=4bdc173ee7802898ae46a09357e244210d4dd8e1;hp=19b4e7c264a202a9a810c8aa4befe669f9c61f11;hpb=6033f1d6fa3d37e068a56c29ef47b220abb3174d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/configure b/configure index 19b4e7c26..45bb0e911 100755 --- a/configure +++ b/configure @@ -33,30 +33,17 @@ BEGIN { use strict; use warnings FATAL => qw(all); -use Data::Dumper; -BEGIN { - $Data::Dumper::Sortkeys = 1; - $Data::Dumper::Useqq = 1; -}; - use File::Copy (); +use File::Spec::Functions qw(rel2abs); use Cwd; use Getopt::Long; -# Utility functions for our buildsystem -use make::utilities; use make::configure; +use make::utilities; -############################################################################################### -# -# NON-EDITABLE VARIABLES -# -############################################################################################### - -our ($opt_use_gnutls, $opt_use_openssl, $opt_nointeractive, $opt_socketengine, $opt_freebsd_port, - $opt_system, $opt_uid); - -our ($opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir, $opt_data_dir, $opt_log_dir); +our ($opt_use_gnutls, $opt_use_openssl, $opt_nointeractive, $opt_socketengine, + $opt_system, $opt_uid, $opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir, + $opt_data_dir, $opt_log_dir); sub list_extras (); @@ -74,16 +61,15 @@ GetOptions ( 'enable-openssl' => \$opt_use_openssl, 'disable-interactive' => \$opt_nointeractive, 'socketengine=s' => \$opt_socketengine, - '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, 'data-dir=s' => \$opt_data_dir, 'log-dir=s' => \$opt_log_dir, - 'help' => sub { showhelp(); }, - 'update' => sub { update(); }, - 'clean' => sub { clean(); }, + 'help' => \&cmd_help, + 'update' => \&cmd_update, + 'clean' => \&cmd_clean, '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, # ^ @@ -112,18 +98,15 @@ our $interactive = !( (defined $opt_use_openssl) || (defined $opt_system) || (defined $opt_uid) || - (defined $opt_use_gnutls) || - (defined $opt_freebsd_port) + (defined $opt_use_gnutls) ); -chomp(our $topdir = getcwd()); -our $this = resolve_directory($topdir); # PWD, Regardless. -our @modlist = (); # Declare for Module List.. -our %config = (); # Initiate Configuration Hash.. -our $cache_loaded = getcache(); -$config{ME} = resolve_directory($topdir); # Present Working Directory +our %config = read_configure_cache(); + +print "Checking for cache from previous configure... "; +print %config ? "found\n" : "not found\n"; -$config{BASE_DIR} = $config{ME}."/run"; +$config{BASE_DIR} = getcwd()."/run"; if (defined $opt_base_dir) { $config{BASE_DIR} = $opt_base_dir; @@ -132,21 +115,19 @@ if (defined $opt_base_dir) { } 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'; + $config{UID} = defined $opt_uid ? $opt_uid : 'ircd'; + $config{CONFIG_DIR} = '/etc/inspircd'; + $config{MODULE_DIR} = '/usr/lib/inspircd'; + $config{BINARY_DIR} = '/usr/sbin/'; + $config{DATA_DIR} = '/var/inspircd'; + $config{LOG_DIR} = '/var/log/inspircd'; } else { - $config{UID} = $opt_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{UID} = defined $opt_uid ? $opt_uid : $<; + $config{CONFIG_DIR} = rel2abs($config{BASE_DIR}."/conf"); + $config{MODULE_DIR} = rel2abs($config{BASE_DIR}."/modules"); + $config{BINARY_DIR} = rel2abs($config{BASE_DIR}."/bin"); + $config{DATA_DIR} = rel2abs($config{BASE_DIR}."/data"); + $config{LOG_DIR} = rel2abs($config{BASE_DIR}."/logs"); } if (defined $opt_config_dir) { @@ -164,51 +145,22 @@ if (defined $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) -{ - 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"; -} -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} = ""; - } -} +chomp($config{HAS_GNUTLS} = `pkg-config --modversion gnutls 2>/dev/null`); +chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`); chomp(our $gnutls_ver = $config{HAS_GNUTLS}); chomp(our $openssl_ver = $config{HAS_OPENSSL}); -$config{USE_GNUTLS} = "n"; +$config{USE_GNUTLS} = 0; if (defined $opt_use_gnutls) { $config{USE_GNUTLS} = "y"; # Use gnutls. } -$config{USE_OPENSSL} = "n"; # Use openssl. +$config{USE_OPENSSL} = 0; # Use openssl. if (defined $opt_use_openssl) { $config{USE_OPENSSL} = "y"; } -$config{HAS_STDINT} = "false"; # stdint.h check -$config{OSNAME} = $^O; # Operating System Name -$config{STARTSCRIPT} = "inspircd"; # start script? -$config{DESTINATION} = "BASE"; # Is target path. -if ($config{OSNAME} =~ /darwin/i) -{ - $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX. -} - $config{CXX} = defined $ENV{CXX} && !system("$ENV{CXX} -v > /dev/null 2>&1") ? $ENV{CXX} : find_compiler(); if ($config{CXX} eq "") { print "A C++ compiler could not be detected on your system!\n"; @@ -229,107 +181,25 @@ if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)(?:[a-z])?(?:\-[a-z][0-9])?/) { $config{HAS_OPENSSL} = ""; } -# Get and Set some important vars.. -getmodules(); - -sub clean -{ - unlink(".config.cache"); -} +$config{HAS_CLOCK_GETTIME} = run_test 'clock_gettime()', test_file($config{CXX}, 'clock_gettime.cpp', '-lrt'); +$config{HAS_EVENTFD} = run_test 'eventfd()', test_file($config{CXX}, 'eventfd.cpp'); -sub update -{ - 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"; - %cxx = get_compiler_info($config{CXX}); - writefiles(1); - makecache(); - print "Complete.\n"; - exit; - } - }; - if ($@) - { - print "Configure update failed: $@\n"; - } - exit; +if ($config{HAS_EPOLL} = run_test 'epoll', test_header($config{CXX}, 'sys/epoll.h')) { + $config{SOCKETENGINE} ||= 'epoll'; } -print "Running non-interactive configure...\n" unless $interactive; -print "Checking for cache from previous configure... "; -print ($cache_loaded ? "found\n" : "not found\n"); -$config{SYSTEM} = lc $^O; -print "Checking operating system version... $config{SYSTEM}\n"; - -print "Checking whether exists... "; -if (test_header($config{CXX}, "stdint.h")) { - $config{HAS_STDINT} = "true"; - print "yes\n"; -} else { - $config{HAS_STDINT} = "false"; - print "no\n"; +if ($config{HAS_KQUEUE} = run_test 'kqueue', test_file($config{CXX}, 'kqueue.cpp')) { + $config{SOCKETENGINE} ||= 'kqueue'; } -printf "Checking whether clock_gettime() exists... "; -if (test_file($config{CXX}, "clock_gettime.cpp", "-lrt")) { - $config{HAS_CLOCK_GETTIME} = "true"; - print "yes\n"; -} else { - $config{HAS_CLOCK_GETTIME} = "false"; - print "no\n"; +if ($config{HAS_PORTS} = run_test 'Solaris IOCP', test_header($config{CXX}, 'port.h')) { + $config{SOCKETENGINE} ||= 'ports'; } -printf "Checking whether eventfd() exists... "; -if (test_file($config{CXX}, "eventfd.cpp")) { - $config{HAS_EVENTFD} = "true"; - print "yes\n"; -} else { - $config{HAS_EVENTFD} = "false"; - print "no\n"; +if ($config{HAS_POLL} = run_test 'poll', test_header($config{CXX}, 'poll.h')) { + $config{SOCKETENGINE} ||= 'poll'; } -printf "Checking if a TCP deferring mechanism is available... "; -if (test_file($config{CXX}, "tcp_defer_accept.cpp")) { - $config{HAS_DEFER} = "TCP_DEFER_ACCEPT"; - print "yes (TCP_DEFER_ACCEPT)\n"; -} elsif (test_file($config{CXX}, "so_acceptfilter.cpp")) { - $config{HAS_DEFER} = "SO_ACCEPTFILTER"; - print "yes (SO_ACCEPTFILTER)\n"; -} else { - $config{HAS_DEFER} = "false"; - print "no\n"; -} - -print "Checking whether epoll is available... "; -$config{HAS_EPOLL} = test_header($config{CXX}, "sys/epoll.h"); -print $config{HAS_EPOLL} ? "yes\n" : "no\n"; -$config{SOCKETENGINE} ||= "epoll" if $config{HAS_EPOLL}; - -print "Checking whether Kqueue is available... "; -$config{HAS_KQUEUE} = test_file($config{CXX}, "kqueue.cpp"); -print $config{HAS_KQUEUE} ? "yes\n" : "no\n"; -$config{SOCKETENGINE} ||= "kqueue" if $config{HAS_KQUEUE}; - -print 'Checking whether Solaris IOCP is available... '; -$config{HAS_PORTS} = test_header($config{CXX}, 'port.h'); -print $config{HAS_PORTS} ? "yes\n" : "no\n"; -$config{SOCKETENGINE} ||= "ports" if $config{HAS_PORTS}; - -print 'Checking whether poll is available... '; -$config{HAS_POLL} = test_header($config{CXX}, 'poll.h'); -print $config{HAS_POLL} ? "yes\n" : "no\n"; -$config{SOCKETENGINE} ||= "poll" if $config{HAS_POLL}; - # Select is available on all platforms $config{HAS_SELECT} = 1; $config{SOCKETENGINE} ||= "select"; @@ -350,7 +220,7 @@ if (defined $opt_socketengine) { } } -printf "Checking for libgnutls... "; +print "Checking for libgnutls... "; if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y"))) { if (defined($gnutls_ver) && ($gnutls_ver ne "")) { print "yes\n"; @@ -364,7 +234,7 @@ if (defined($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS}) || ($config{HAS_GNUTL $config{HAS_GNUTLS} = "n"; } -printf "Checking for openssl... "; +print "Checking for openssl... "; if (defined($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL}) || ($config{HAS_OPENSSL} eq "y"))) { if (defined($openssl_ver) && ($openssl_ver ne "")) { print "yes\n"; @@ -378,41 +248,16 @@ if (defined($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL}) || ($config{HAS_OPE $config{HAS_OPENSSL} = "n"; } -printf "Checking if you are running an ancient, unsupported OS... "; -if ($config{OSNAME} =~ /FreeBSD/i) -{ - my $version = `uname -r`; - if ($version =~ /^4\./) - { - 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 - { - print "no ($version)\n"; - } -} -else -{ - print "no ($config{OSNAME})\n"; -} - -################################################################################ -# BEGIN INTERACTIVE PART # -################################################################################ - -# Clear the Screen.. if ($interactive) { - print "\e[2J\e[0G\e[0d"; # J = Erase in Display, 2 = Entire Screen, (G, d) = Move cursor to (..,..) - my $wholeos = $^O; + # Clear the screen. + system 'tput', 'clear'; + + my %version = get_version(); - 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 *** @@ -423,125 +268,107 @@ Press \e[1m\e[0m to accept the default for any option, or enter 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) -Your InspIRCd revision ID is \e[1;32mr$rev\e[0m +Your operating system is: \e[1;32m$^O\e[0m STOP - if ($rev eq "r0") { - print " (Non-SVN build)"; - } - print ".\n\n"; + print "Your InspIRCd version is: \e[1;32m"; + print "$version{MAJOR}.$version{MINOR}.$version{PATCH}+$version{LABEL}"; + print "\e[0m\n\n"; + print "The following compiler has been detected: \e[1;32m$cxx{NAME} $cxx{VERSION}\e[0m ($config{CXX})\n\n"; + + # Check that the user actually wants this version. + if ($version{LABEL} ne 'release') { + print <<"EOW" ; +\e[1;31mWARNING!\e[0m You are building a development version. This contains code which has +not been tested as heavily and may contain various faults which could seriously +affect the running of your server. It is recommended that you use a stable +version instead. - print "I have detected the following compiler: \e[1;32m$cxx{NAME}\e[0m (version \e[1;32m$cxx{VERSION}\e[0m)\n\n"; +You can obtain the latest stable version from https://github.com/inspircd/inspircd/releases +or by running `git checkout insp20` if you are installing from Git. + +EOW + exit 1 unless prompt_bool(1, 'I understand this warning and want to continue anyway.', 0); + } # Directory Settings.. my $tmpbase = $config{BASE_DIR}; - dir_check("do you wish to install the InspIRCd base", "BASE_DIR"); + $config{BASE_DIR} = prompt_dir(1, 'What directory do you wish to install the InspIRCd base?', $config{BASE_DIR}); 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{CONFIG_DIR} = rel2abs($config{BASE_DIR}."/conf"); + $config{MODULE_DIR} = rel2abs($config{BASE_DIR}."/modules"); + $config{DATA_DIR} = rel2abs($config{BASE_DIR}."/data"); + $config{LOG_DIR} = rel2abs($config{BASE_DIR}."/logs"); + $config{BINARY_DIR} = rel2abs($config{BASE_DIR}."/bin"); } - 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 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"); - + $config{BINARY_DIR} = prompt_dir(1, 'In what directory should the InspIRCd binary be placed?', $config{BINARY_DIR}); + $config{CONFIG_DIR} = prompt_dir(1, 'In what directory are the configuration files to be stored?', $config{CONFIG_DIR}); + $config{DATA_DIR} = prompt_dir(1, 'In what directory are variable data files to be stored?', $config{DATA_DIR}); + $config{LOG_DIR} = prompt_dir(1, 'In what directory are log files to be stored?', $config{LOG_DIR}); + $config{MODULE_DIR} = prompt_dir(1, 'In what directory are the modules to be placed?', $config{MODULE_DIR}); + my $chose_hiperf = 0; if ($config{HAS_KQUEUE}) { - $config{USE_KQUEUE} = "y"; - 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") { + $config{USE_KQUEUE} = prompt_bool(1, 'Your operating system has support for the high performance kqueue socket engine. Would you like to enable it?', 1); + if ($config{USE_KQUEUE}) { $config{SOCKETENGINE} = "kqueue"; $chose_hiperf = 1; } } if ($config{HAS_EPOLL}) { - $config{USE_EPOLL} = "y"; - 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") { + $config{USE_EPOLL} = prompt_bool(1, 'Your operating system has support for the high performance epoll socket engine. Would you like to enable it?', 1); + if ($config{USE_EPOLL}) { $config{SOCKETENGINE} = "epoll"; $chose_hiperf = 1; } } if ($config{HAS_PORTS}) { - $config{USE_PORTS} = "y"; - 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") { + $config{USE_PORTS} = prompt_bool(1, 'Your operating system has support for the high performance IOCP socket engine. Would you like to enable it?', 1); + if ($config{USE_PORTS}) { $config{SOCKETENGINE} = "ports"; $chose_hiperf = 1; } } if (!$chose_hiperf && $config{HAS_POLL}) { - $config{USE_POLL} = "y"; - yesno('USE_POLL', "Would you like to use poll?\nThis is likely to increase performance.\nIf you are unsure, answer yes.\n\nEnable poll?"); - if ($config{USE_POLL} eq "y") { + $config{USE_POLL} = prompt_bool(1, 'Your operating system has support for the mid performance poll socket engine. Would you like to enable it?', 1); + if ($config{USE_POLL}) { $config{SOCKETENGINE} = "poll"; } } - if (!$chose_hiperf && $config{USE_POLL} ne "y") + unless ($chose_hiperf || $config{USE_POLL}) { - print "No high-performance socket engines are available, or you chose\n"; - print "not to enable one. Defaulting to select() engine.\n\n"; + print "No high-performance socket engines are available, or you chose not to enable one. Defaulting to select() engine.\n\n"; $config{SOCKETENGINE} = "select"; } - $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 "Detected GnuTLS version: \e[1;32m" . $gnutls_ver . "\e[0m\n"; print "Detected OpenSSL version: \e[1;32m" . $openssl_ver . "\e[0m\n\n"; - yesno('USE_SSL', "One or more SSL libraries detected. Would you like to enable SSL support?"); - if ($config{USE_SSL} eq "y") + $config{USE_SSL} = prompt_bool(1, 'One or more SSL libraries detected. Would you like to enable SSL support?', 1); + if ($config{USE_SSL}) { 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") + $config{USE_GNUTLS} = prompt_bool(1, 'Would you like to enable SSL with m_ssl_gnutls (recommended)?', 1); + if ($config{USE_GNUTLS}) { - print "\nUsing GnuTLS SSL module.\n"; + print "Using GnuTLS SSL module.\n\n"; + unlink 'src/modules/m_ssl_gnutls.cpp' if -f 'src/modules/m_ssl_gnutls.cpp'; + symlink "extra/m_ssl_gnutls.cpp", "src/modules/m_ssl_gnutls.cpp" or print STDERR "Symlink failed: $!\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") + $config{USE_OPENSSL} = prompt_bool(1, 'Would you like to enable SSL with m_ssl_openssl (recommended)?', 1); + if ($config{USE_OPENSSL}) { - print "\nUsing OpenSSL SSL module.\nYou will get better performance if you move to GnuTLS in the future.\n"; + print "Using OpenSSL SSL module.\n\n"; + unlink 'src/modules/m_ssl_openssl.cpp' if -f 'src/modules/m_ssl_openssl.cpp'; + symlink "extra/m_ssl_openssl.cpp", "src/modules/m_ssl_openssl.cpp" or print STDERR "Symlink failed: $!\n"; } } } @@ -551,366 +378,57 @@ STOP 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"; -if (($config{USE_GNUTLS} eq "y") && ($config{HAS_GNUTLS} ne "y")) +if (($config{USE_GNUTLS}) && ($config{HAS_GNUTLS} ne "y")) { - print "Sorry, but i couldn't detect gnutls. Make sure gnutls-config is in your path.\n"; - exit(0); + print "Sorry, but I couldn't detect GnuTLS. Make sure pkg-config is in your path.\n"; + exit 1; } -if (($config{USE_OPENSSL} eq "y") && ($config{HAS_OPENSSL} ne "y")) +if (($config{USE_OPENSSL}) && ($config{HAS_OPENSSL} ne "y")) { - print "Sorry, but i couldn't detect openssl. Make sure openssl is in your path.\n"; - exit(0); + print "Sorry, but I couldn't detect OpenSSL. Make sure pkg-config is in your path.\n"; + exit 1; } -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: $!"; - } - 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 -************************************************************* -* 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 * -*************************************************************\n\n"; - $failed = system "./tools/genssl gnutls"; - if ($failed) { - print "\n\e[1;32mCertificate generation failed!\e[0m\n\n"; - } else { +if ($config{USE_GNUTLS} || $config{USE_OPENSSL}) { + if (my $val = prompt_bool($interactive, 'Would you like to generate SSL certificates now?', $interactive)) { + unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem" && -r "$config{CONFIG_DIR}/dhparams.pem") { + unless (system './tools/genssl auto') { print "\nCertificate generation complete, copying to config directory... "; File::Copy::move("key.pem", "$config{CONFIG_DIR}/key.pem") or print STDERR "Could not copy key.pem!\n"; File::Copy::move("cert.pem", "$config{CONFIG_DIR}/cert.pem") or print STDERR "Could not copy cert.pem!\n"; + 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"; - } - } - else - { - print "Skipping SSL certificate generation\nin non-interactive mode.\n\n"; - } -} - -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: $!"; - } - $failed = 0; - 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 -************************************************************* -* Generating the certificates may take some time, go grab a * -* coffee, or something. * -*************************************************************\n\n"; - system "./tools/genssl openssl"; - print "\nCertificate generation complete, copying to config directory... "; - File::Copy::move("key.pem", "$config{CONFIG_DIR}/key.pem") or print STDERR "Could not copy key.pem!\n"; - File::Copy::move("cert.pem", "$config{CONFIG_DIR}/cert.pem") or print STDERR "Could not copy cert.pem!\n"; - 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 { + print "Skipping SSL certificate generation in non-interactive mode.\n\n"; } - else - { - print "Skipping SSL certificate generation\nin non-interactive mode.\n\n"; - } -} -if (($config{USE_GNUTLS} eq "n") && ($config{USE_OPENSSL} eq "n")) { +} else { print "Skipping SSL Certificate generation, SSL support is not available.\n\n"; } -depcheck(); -writefiles(1); -makecache(); -dumphash(); +print "Writing \e[1;32m.config.cache\e[0m ...\n"; +write_configure_cache(%config); +parse_templates(\%config, \%cxx); +dump_hash(); print "\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")) { +if ($config{USE_GNUTLS} || $config{USE_OPENSSL}) { 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"; -################################################################################ -# HELPER FUNCTIONS # -################################################################################ -sub getcache { - # Retrieves the .config.cache file, and loads values into the main config hash. - open(CACHE, ".config.cache") or return 0; - while () { - chomp; - # Ignore Blank lines, and comments.. - next if /^\s*$/; - next if /^\s*#/; - my ($key, $value) = split("=", $_, 2); - $value =~ /^\"(.*)\"$/; - # Do something with data here! - $config{$key} = $1; - } - close(CACHE); - return 1; -} - -sub makecache { - # Dump the contents of %config - print "Writing \e[1;32mcache file\e[0m for future ./configures ...\n"; - open(FILEHANDLE, ">.config.cache"); - foreach my $key (keys %config) { - print FILEHANDLE "$key=\"$config{$key}\"\n"; - } - close(FILEHANDLE); -} - -sub dir_check { - my ($desc, $hash_key) = @_; - my $complete = 0; - while (!$complete) { - print "In what directory $desc?\n"; - print "[\e[1;32m$config{$hash_key}\e[0m] -> "; - chomp(my $var = ); - if ($var eq "") { - $var = $config{$hash_key}; - } - if ($var =~ /^\~\/(.+)$/) { - # Convert it to a full path.. - $var = resolve_directory($ENV{HOME} . "/" . $1); - } - elsif ((($config{OSNAME} =~ /MINGW32/i) and ($var !~ /^[A-Z]{1}:\\.*/)) and (substr($var,0,1) ne "/")) - { - # Assume relative Path was given.. fill in the rest. - $var = $this . "/$var"; - } - - $var = resolve_directory($var); - if (! -e $var) { - print "$var does not exist. Create it?\n[\e[1;32my\e[0m] "; - chomp(my $tmp = ); - if (($tmp eq "") || ($tmp =~ /^y/i)) { - # Attempt to Create the Dir.. - my $chk = eval { - use File::Path (); - File::Path::mkpath($var, 0, 0777); - 1; - }; - unless (defined($chk) && -d $var) { - print "Unable to create directory. ($var)\n\n"; - # Restart Loop.. - next; - } - } else { - # They said they don't want to create, and we can't install there. - print "\n\n"; - next; - } - } else { - if (!is_dir($var)) { - # Target exists, but is not a directory. - print "File $var exists, but is not a directory.\n\n"; - next; - } - } - # Either Dir Exists, or was created fine. - $config{$hash_key} = $var; - $complete = 1; - print "\n"; - } -} - -our $SHARED = ""; - -my ($mliflags, $mfrules, $mobjs, $mfcount) = ("", "", "", 0); - -sub writefiles { - my($writeheader) = @_; - # First File.. 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;32mconfig.h\e[0m\n"; - open(FILEHANDLE, ">include/config.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 all .in files. - my $tmp = ""; - my $file = ""; - 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($version = `sh ./src/version.sh`); - chomp(my $revision = getrevision()); - $version = "$version(r$revision)"; - - my @dotfiles = qw(main.mk inspircd); - push @dotfiles, 'org.inspircd.plist' if $config{OSNAME} eq 'darwin'; - - foreach my $file (@dotfiles) { - open(FILEHANDLE, "make/template/$file") or die "Can't open make/template/$file: $!"; - $_ = join '', ; - close(FILEHANDLE); - - $config{BUILD_DIR} ||= resolve_directory($config{ME}."/build"); - $config{COMPILER} = lc $cxx{NAME}; - - for my $var (qw( - CXX COMPILER SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR DATA_DIR UID - STARTSCRIPT DESTINATION SOCKETENGINE - )) { - 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/\@IFNEQ (\S+) (\S+)/ifneq ($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/\@IFNEQ (\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); - } - } - - chmod 0755, 'inspircd'; -} - -sub depcheck -{ - getmodules(); - for my $mod (@modlist) { - getcompilerflags("src/modules/m_$mod.cpp"); - getlinkerflags("src/modules/m_$mod.cpp"); - } -} - # Routine to list out the extra/ modules that have been enabled. # Note: when getting any filenames out and comparing, it's important to lc it if the # file system is not case-sensitive (== Epoc, MacOS, OS/2 (incl DOS/DJGPP), VMS, Win32 @@ -974,7 +492,7 @@ EXTRA: for my $extra (@extras) { for my $extra (keys(%extras)) { next unless $extras{$extra} =~ m/enabled/; # only process enabled extras. my $abs_extra = File::Spec->catfile($abs_srcdir, "extra", $extra); - my @deps = split / +/, getdependencies($abs_extra); + my @deps = split /\s+/, get_property($abs_extra, 'ModDep'); for my $dep (@deps) { if (exists($extras{$dep})) { my $ref = \$extras{$dep}; # Take reference. @@ -1021,7 +539,7 @@ sub enable_extras (@) { next; } # Get dependencies, and add them to be processed. - my @deps = split / +/, getdependencies($extrapath); + my @deps = split /\s+/, get_property($extrapath, 'ModDep'); for my $dep (@deps) { next if scalar(grep { $_ eq $dep } (@extras)) > 0; # Skip if we're going to be enabling it anyway. if (!-e "src/modules/$dep" && !-e "include/$dep") { @@ -1057,7 +575,7 @@ EXTRA: for my $extra (@extras) { } # Check if anything needs this. for my $file (@files) { - my @deps = split / +/, getdependencies("src/modules/extra/$file"); + my @deps = split /\s+/, get_property("src/modules/extra/$file", 'ModDep'); # File depends on this extra... if (scalar(grep { $_ eq $extra } @deps) > 0) { # And is both enabled and not about to be disabled.