X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=721505fcc95ec5615b04d99e72c591d281c19d89;hb=eac05f8d05ce2e3878ac4a51675b11e64831adac;hp=cd21375b5dd06557f0d977a858a982a6bb51d28b;hpb=7aa5e059a8f66d91bd8b69c58c657ceb70b4baff;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/configure b/configure index cd21375b5..721505fcc 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ -#!/usr/bin/perl +#!/usr/bin/env perl ################################################### # InspIRCd Configuration Script # -# Copyright 2002-2009 The InspIRCd Development Team +# Copyright 2002-2010 The InspIRCd Development Team # http://wiki.inspircd.org/Credits # # Licensed under GPL, please see the COPYING file @@ -44,10 +44,10 @@ use make::opensslcert; our ($opt_use_gnutls, $opt_rebuild, $opt_use_openssl, $opt_nointeractive, $opt_ports, $opt_epoll, $opt_kqueue, $opt_noports, $opt_noepoll, $opt_nokqueue, - $opt_noipv6, $opt_maxbuf, $opt_disable_debug, $opt_freebsd_port); + $opt_noipv6, $opt_maxbuf, $opt_disable_debug, $opt_freebsd_port, + $opt_system, $opt_uid); -our ($opt_cc, $opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir, - $opt_library_dir); +our ($opt_cc, $opt_base_dir, $opt_config_dir, $opt_module_dir, $opt_binary_dir); sub list_extras (); @@ -61,6 +61,8 @@ my @opt_disableextras; GetOptions ( 'enable-gnutls' => \$opt_use_gnutls, 'rebuild' => \$opt_rebuild, + 'system' => \$opt_system, + 'uid=s' => \$opt_uid, 'enable-openssl' => \$opt_use_openssl, 'disable-interactive' => \$opt_nointeractive, 'enable-ports' => \$opt_ports, @@ -77,11 +79,9 @@ GetOptions ( 'config-dir=s' => \$opt_config_dir, 'module-dir=s' => \$opt_module_dir, 'binary-dir=s' => \$opt_binary_dir, - 'library-dir=s' => \$opt_library_dir, 'disable-debuginfo' => sub { $opt_disable_debug = 1 }, 'help' => sub { showhelp(); }, 'update' => sub { update(); }, - 'svnupdate' => sub { svnupdate(); }, 'clean' => sub { clean(); }, 'list-extras' => sub { list_extras; exit 0; }, # This, --enable-extras, and --disable-extras are for non-interactive managing. 'enable-extras=s@' => \@opt_enableextras, # ^ @@ -100,8 +100,7 @@ if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) { exit 0; } -our $non_interactive = ( - (defined $opt_library_dir) || +our $interactive = !( (defined $opt_base_dir) || (defined $opt_config_dir) || (defined $opt_module_dir) || @@ -118,39 +117,47 @@ our $non_interactive = ( (defined $opt_noepoll) || (defined $opt_noports) || (defined $opt_maxbuf) || + (defined $opt_system) || + (defined $opt_uid) || (defined $opt_use_gnutls) || (defined $opt_freebsd_port) ); -our $interactive = !$non_interactive; chomp(our $topdir = getcwd()); our $this = resolve_directory($topdir); # PWD, Regardless. our @modlist = (); # Declare for Module List.. our %config = (); # Initiate Configuration Hash.. -$config{ME} = resolve_directory($topdir); # Present Working Directory +$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 || defined $opt_uid) { + $config{BASE_DIR} = '/var/lib/inspircd'; } -$config{CONFIG_DIR} = resolve_directory($config{BASE_DIR}."/conf"); # Configuration Directory -$config{MODULE_DIR} = resolve_directory($config{BASE_DIR}."/modules"); # Modules Directory -$config{BINARY_DIR} = resolve_directory($config{BASE_DIR}."/bin"); # Binary Directory -$config{BUILD_DIR} = resolve_directory($config{ME}."/build"); # Build Directory +if (defined $opt_system || defined $opt_uid) { + $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 +} else { + $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 +} -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; } chomp($config{HAS_GNUTLS} = `pkg-config --modversion gnutls 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version. @@ -189,66 +196,38 @@ if (defined $opt_use_openssl) $config{USE_OPENSSL} = "y"; } -# no, let's not change these. -$config{OPTIMITEMP} = "0"; # Default Optimisation Value -if (!defined $opt_disable_debug) -{ +if (!defined $opt_disable_debug) { $config{OPTIMISATI} = "-g1"; # Optimisation Flag -} -else -{ - $config{OPTIMISATI} = "-O2"; # DEBUGGING OFF! +} else { + $config{OPTIMISATI} = "-O2"; } $config{HAS_STRLCPY} = "false"; # strlcpy Check. $config{HAS_STDINT} = "false"; # stdint.h check $config{USE_KQUEUE} = "y"; # kqueue enabled -if (defined $opt_kqueue) -{ - $config{USE_KQUEUE} = "y"; -} -if (defined $opt_nokqueue) -{ +if (defined $opt_nokqueue) { $config{USE_KQUEUE} = "n"; } $config{USE_POLL} = "y"; # poll enabled $config{USE_EPOLL} = "y"; # epoll enabled -if (defined $opt_epoll) -{ - $config{USE_EPOLL} = "y"; -} if (defined $opt_noepoll) { $config{USE_EPOLL} = "n"; } $config{USE_PORTS} = "y"; # epoll enabled -if (defined $opt_ports) -{ - $config{USE_PORTS} = "y"; -} if (defined $opt_noports) { $config{USE_PORTS} = "n"; } -$config{IPV6} = "y"; # IPv6 support -if (defined $opt_noipv6) -{ - $config{IPV6} = "n"; -} -chomp($config{GCCVER} = `g++ -dumpversion | cut -c 1`); # Major GCC Version -chomp($config{GCCMINOR} = `g++ -dumpversion | cut -c 3`); $config{_SOMAXCONN} = SOMAXCONN; # Max connections in accept queue $config{OSNAME} = $^O; # Operating System Name $config{IS_DARWIN} = "NO"; # Is OSX? $config{STARTSCRIPT} = "inspircd"; # start script? $config{DESTINATION} = "BASE"; # Is target path. -$config{EXTRA_DIR} = ""; # Is empty. if ($config{OSNAME} =~ /darwin/i) { $config{IS_DARWIN} = "YES"; $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX. - $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target. - $config{EXTRA_DIR} = " launchd_dir"; # Is OSX specific path. } $config{CC} = "g++"; # C++ compiler if (defined $opt_cc) @@ -317,84 +296,6 @@ sub update exit; } -sub svnupdate -{ - my $fail = 0; - open(FH,"<.svn/entries") or $fail = 1; - if ($fail) { - print "This is not an SVN copy of InspIRCd.\n"; - exit 1; - } - else - { - close(FH); - } - open my $fd, "-|", "svn update"; - my $configurechanged = 0; # Needs ./configure -update - my $rootincchanged = 0; - my @conflicted = (); - while (defined(my $line = <$fd>)) - { - my ($action, $file); - print $line; - $line =~ m/^([ADUCG])\s+(.*)$/ or next; - ($action, $file) = ($1, $2); - if ($action eq "C") - { - push @conflicted, $file; - if ($file eq "configure") - { - $configurechanged = 1; - } - elsif ($file =~ m/^\..*\.inc$/) - { - $rootincchanged = 1; - } - } - elsif ($action eq "U" || $action eq "G") - { - if ($file eq "configure") - { - $configurechanged = 1; - } - elsif ($file =~ m/^\..*\.inc$/) - { - $rootincchanged = 1; - } - } - } - unless (close $fd) # close() waits for exit and returns false if the command failed - { - if ($! == 0) - { - print STDERR "Problem updating from SVN, please check above for errors\n"; - } - else - { - print STDERR "Failed to run SVN: $!\n"; - } - exit 1; - } - if (scalar(@conflicted) > 0) - { - print STDERR "\e[0;33;1mERROR:\e[0m You have local modifications which conflicted with the updates from SVN\n"; - print STDERR "Configure is not able to complete the update. Please resolve these conflicts, then run ./configure -update\n"; - print "Conflicted files: " . join ", ", @conflicted . "\n"; - exit 1; - } - if ($configurechanged) - { - system("perl configure -update"); - } - else - { - print "No need to update Makefiles.\n"; - } - if (defined $opt_rebuild) { - system("make install"); - } - exit; -} sub test_compile { my $feature = shift; @@ -411,6 +312,11 @@ print ((!getcache()) ? "not found\n" : "found\n"); $config{SYSTEM} = lc $^O; print "Checking operating system version... $config{SYSTEM}\n"; +$exec = $config{CC} . " -dumpversion | cut -c 1"; +chomp($config{GCCVER} = `$exec`); # Major GCC Version +$exec = $config{CC} . " -dumpversion | cut -c 3"; +chomp($config{GCCMINOR} = `$exec`); + printf "Checking if stdint.h exists... "; $config{HAS_STDINT} = "true"; our $fail = 0; @@ -534,9 +440,6 @@ else print "no ($config{OSNAME})\n"; } -print "Checking for upgrades to extra and third party modules... "; -system "./modulemanager upgrade"; - ################################################################################ # BEGIN INTERACTIVE PART # ################################################################################ @@ -646,9 +549,6 @@ should NOT be used. You should probably specify a newer compiler.\n\n"; } } - yesno('IPV6',"Would you like to build InspIRCd with IPv6 support?\nYou can still use IPv4 addresses in your port bindings.\n\nEnable IPv6?"); - print "\n"; - $config{USE_FREEBSD_BASE_SSL} = "n"; $config{USE_FREEBSD_PORTS_SSL} = "n"; if ($config{HAS_OPENSSL_PORT} ne "") @@ -672,6 +572,7 @@ should NOT be used. You should probably specify a newer compiler.\n\n"; } $config{USE_SSL} = "n"; + $config{MODUPDATE} = 'n'; if ($config{HAS_GNUTLS} eq "y" || $config{HAS_OPENSSL} eq "y") { @@ -705,8 +606,18 @@ should NOT be used. You should probably specify a newer compiler.\n\n"; 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"; } + + 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")) @@ -957,12 +868,12 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n"; if ($config{HAS_STDINT} eq "true") { print FILEHANDLE "#define HAS_STDINT\n"; } - if ($config{IPV6} =~ /y/i) { - print FILEHANDLE "#define IPV6\n"; - } if ($config{HAS_EVENTFD} eq 'true') { print FILEHANDLE "#define HAS_EVENTFD\n"; } + if ($config{OSNAME} !~ /DARWIN/i) { + print FILEHANDLE "#define HAS_CLOCK_GETTIME\n"; + } my $use_hiperf = 0; if (($has_kqueue) && ($config{USE_KQUEUE} eq "y")) { print FILEHANDLE "#define USE_KQUEUE\n"; @@ -1047,74 +958,66 @@ EOF # but right now we only parse .inspircd.inc to form './inspircd' prepare_dynamic_makefile(); - print "Writing \e[1;32mMakefiles\e[0m\n"; - - opendir(DIRHANDLE, $this); - - foreach my $name (sort readdir(DIRHANDLE)) { - if ($name =~ /^\.(.+)\.inc$/) { - $file = $1; + my @dotfiles = qw(main.mk inspircd); + push @dotfiles, 'org.inspircd.plist' if $config{OSNAME} eq 'darwin'; - # Bug #353, omit this on non-darwin - next if (($config{OSNAME} !~ /darwin/) && ($file eq "org.inspircd.plist")); + foreach my $file (@dotfiles) { + open(FILEHANDLE, "make/template/$file") or die "Can't open make/template/$file: $!"; + $_ = join '', ; + close(FILEHANDLE); - # All .name.inc files need parsing! - open(FILEHANDLE, ".$file.inc") or die ("Can't open .$file.inc"); - $_ = join '', ; - close(FILEHANDLE); + $config{BUILD_DIR} ||= resolve_directory($config{ME}."/build"); + for my $var (qw( + CC SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR 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/\@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"; - - $config{BUILD_DIR} ||= resolve_directory($config{ME}."/build"); - - for my $var (qw( - CC SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR - STARTSCRIPT DESTINATION EXTRA_DIR SOCKETENGINE - )) { - s/\@$var\@/$config{$var}/g; - } - s/\@EXECUTABLE\@/$exe/ if defined $exe; - s/\@VERSION\@/$version/ if defined $version; - - if ($file eq 'Makefile') { - my $mk_tmp = $_; - s/\@IFDEF (\S+)/ifdef $1/g; - s/\@IFNDEF (\S+)/ifndef $1/g; - s/\@IFEQ (\S+) (\S+)/ifeq ($1,$2)/g; - s/\@ELSIFEQ (\S+) (\S+)/else ifeq ($1,$2)/g; - s/\@ELSE/else/g; - s/\@ENDIF/endif/g; - s/ *\@BSD_ONLY .*\n//g; - s/\@GNU_ONLY //g; - s/\@DO_EXPORT (.*)/export $1/g; - open MKF, '>GNUmakefile' or die "Can't write to GNUmakefile: $!"; - print MKF $_; - close MKF; - $_ = $mk_tmp; - s/\@IFDEF (\S+)/.if defined($1)/g; - s/\@IFNDEF (\S+)/.if !defined($1)/g; - s/\@IFEQ (\S+) (\S+)/.if $1 == $2/g; - s/\@ELSIFEQ (\S+) (\S+)/.elif $1 == $2/g; - s/\@ELSE/.else/g; - s/\@ENDIF/.endif/g; - s/\@BSD_ONLY //g; - s/ *\@GNU_ONLY .*\n//g; - $mk_tmp = $_; - $mk_tmp =~ s#\@DO_EXPORT (.*)#"MAKEENV += ".join ' ', map "$_='\${$_}'", split /\s/, $1#eg; - open MKF, '>BSDmakefile' or die "Can't write to BSDmakefile: $!"; - print MKF $mk_tmp; - close MKF; - } else { - open(FILEHANDLE, ">$file") or die("Can't write to $file: $!\n"); - print FILEHANDLE $_; - close(FILEHANDLE); - } + open(FILEHANDLE, ">$file") or die("Can't write to $file: $!\n"); + print FILEHANDLE $_; + close(FILEHANDLE); } } - closedir(DIRHANDLE); - # Make inspircd executable! - chmod 0744, 'inspircd'; + chmod 0755, 'inspircd'; } sub depcheck @@ -1168,7 +1071,6 @@ sub list_extras () { my %extras = (); EXTRA: for my $extra (@extras) { next if (File::Spec->curdir() eq $extra || File::Spec->updir() eq $extra); - next if ($extra eq '.svn'); my $abs_extra = File::Spec->catfile($abs_srcdir, "extra", $extra); my $abs_source = File::Spec->catfile($abs_srcdir, $extra); next unless ($extra =~ m/\.(cpp|h)$/ || (-d $abs_extra)); # C++ Source/Header, or directory