###################################################
# InspIRCd Configuration Script
#
-# Copyright 2002-2008 The InspIRCd Development Team
+# Copyright 2002-2009 The InspIRCd Development Team
# http://www.inspircd.org/wiki/index.php/Credits
#
# Licensed under GPL, please see the COPYING file
};
use File::Copy ();
-
use Socket;
use Cwd;
use Getopt::Long;
# 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.
'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) {
{
$config{USE_KQUEUE} = "n";
}
+$config{USE_POLL} = "y"; # poll enabled
$config{USE_EPOLL} = "y"; # epoll enabled
if (defined $opt_epoll)
{
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";
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";
{
# 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
{
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?");
$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";
+ 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";
}
}
# 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 = <STDIN>);
$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 = "-shared";
+ $SHARED = "-shared -export-dynamic";
$config{MAKEPROG} = "make";
if ($config{OSNAME} =~ /darwin/i) {
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
$config{LDLIBS} .= " -lsocket -lnsl -lrt -lresolv -pthread";
return "Solaris";
}
-
+
if($config{OSNAME} =~ /MINGW32/i)
{
# All code is position-independent on windows
#define OPTIMISATION $config{OPTIMITEMP}
#define LIBRARYDIR "$config{LIBRARY_DIR}"
#define SYSTEM "$incos"
+#define ENTRYPOINT int main(int argc, char** argv)
EOF
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);
$tmp =~ s/\@INSTALL_LIST\@/$install_list/ if defined $install_list;
$tmp =~ s/\@UNINSTALL_LIST\@/$uninstall_list/ if defined $uninstall_list;
- open(FILEHANDLE, ">$file");
+ open(FILEHANDLE, ">$file") or die("Can't write to $file: $!\n");
print FILEHANDLE $tmp;
}
}
###
print FILEHANDLE <<EOF;
###################################################
-# Copyright 2002-2007 The InspIRCd Development Team
+# Copyright 2002-2009 The InspIRCd Development Team
# http://www.inspircd.org/wiki/index.php/Credits
#
# Thanks to Andrew Church <achurch\@achurch.org>
$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
-"
+ \@../../make/run-cc.pl \$(CC) -pipe -I../../include \$(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
+ \@../../make/run-cc.pl \$(CC) -pipe -I../../include \$(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
###
}
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 " \@../../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";
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");
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 . " \@../../make/run-cc.pl \$(CC) -pipe -I../../include -I. \$(FLAGS) $cmflags $SHARED -o $reldpath/$oname -c $reldpath/$fname\n\n";
$mobjs = $mobjs . " $reldpath/$oname";
$mfcount++;
}
if ($config{IS_DARWIN} eq "YES")
{
$libraryext = "dylib";
- $binary_rule = " \@../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 = " \@../make/run-cc.pl \$(CC) -pipe -I../include \$(FLAGS) -c inspircd.cpp\n \@../make/run-cc.pl \$(CC) -pipe -dynamic -bind_at_load -L. -o inspircd \$(LDLIBS) inspircd.o "
}
else
{
if (exists($core_files_list{$cpp}))
{
- # core files are statically linked into the binary and do not require -export-dynamic
+ # core files are statically linked into the binary and do not require $SHARED shared libs switches
$buildstring = $buildstring . " \@../make/run-cc.pl \$(CC) -pipe -I../include \$(FLAGS) -c $rawcpp\n";
}
else
{
- $buildstring = $buildstring . " \@../make/run-cc.pl \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c $rawcpp\n";
+ $buildstring = $buildstring . " \@../make/run-cc.pl \$(CC) -pipe -I../include \$(FLAGS) $SHARED -c $rawcpp\n";
}
if (exists($extrabuildlines{$cpp}))
ITEM
- # now print the command file details.
+ # now print the command file detail
foreach my $cmd (@cmdlist) {
print FH <<ITEM;
cmd_$cmd.so: cmd_$cmd.cpp ../../include/base.h ../../include/modules.h ../../include/inspircd.h ../../include/channels.h ../../include/users.h ../../include/inspircd_config.h ../../include/commands/cmd_$cmd.h
- \@../../make/run-cc.pl \$(CC) -pipe -I../../include \$(FLAGS) -export-dynamic $SHARED -o cmd_$cmd.so cmd_$cmd.cpp
+ \@../../make/run-cc.pl \$(CC) -pipe -I../../include \$(FLAGS) $SHARED -o cmd_$cmd.so cmd_$cmd.cpp
ITEM
}
projects / user / henk / code / inspircd.git / blobdiff