###################################################
# 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
};
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{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)
{
{
$config{USE_KQUEUE} = "n";
}
+$config{USE_POLL} = "y"; # poll enabled
$config{USE_EPOLL} = "y"; # epoll enabled
if (defined $opt_epoll)
{
chomp($config{GCCVER} = `$exec`); # Major GCC Version
$exec = $config{CC} . " -dumpversion | cut -c 3";
chomp($config{GCCMINOR} = `$exec`);
-$config{MAKEORDER} = "ircd mods"; # build order
$config{MAXBUF} = "512"; # Max buffer size
if ($config{HAS_OPENSSL} =~ /^([-[:digit:].]+)([a-z])?(\-[a-z][0-9])?$/) {
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");
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, "</usr/include/sys/epoll.h") or $fail = 1;
-if (!$fail) {
- $has_epoll = 1;
- close(EPOLL);
-}
-if ($has_epoll) {
- my $kernel = `uname -r`;
- chomp($kernel);
- if (($kernel =~ /^2\.0\./) || ($kernel =~ /^2\.2\./) || ($kernel =~ /^2\.4\./)) {
- $has_epoll = 0;
- }
- else
- {
- # Suggestion from nenolod, weed out odd systems which have glibc built
- # against 2.4 kernels (ick)
- my $kernel_arch = `uname -p`;
- chomp($kernel_arch);
- my $libcv = 0.0;
- my $kernelv = 0.0;
- if ($kernel_arch =~ /x86_64/) {
- open (FH,"/lib64/libc.so.6|") or $has_epoll = 0;
- }
- else {
- open (FH,"/lib/libc.so.6|") or $has_epoll = 0;
- }
- if ($has_epoll)
- {
- while (defined(my $line = <FH>))
- {
- 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;
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"))) {
{
# 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";
}
}
}
our $failed = 0;
+$config{CERTGEN} ||= 'y';
+yesno('CERTGEN',"Would you like generate SSL certificates now?") if $config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y";
+
if ($config{USE_GNUTLS} eq "y") {
unless (-r "src/modules/m_ssl_gnutls.cpp") {
print "Symlinking src/modules/m_ssl_gnutls.cpp from extra/\n";
symlink "extra/m_ssl_gnutls.cpp", "src/modules/m_ssl_gnutls.cpp" or print STDERR "Symlink failed: $!";
}
- getmodules();
- if ($interactive)
+ if ($interactive && $config{CERTGEN} eq 'y')
{
unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem") {
print "SSL Certificates Not found, Generating.. \n\n
{
print "Skipping SSL certificate generation\nin non-interactive mode.\n\n";
}
-} elsif ($config{USE_OPENSSL} eq "y") {
+}
+
+if ($config{USE_OPENSSL} eq "y") {
unless (-r "src/modules/m_ssl_openssl.cpp") {
print "Symlinking src/modules/m_ssl_openssl.cpp from extra/\n";
symlink "extra/m_ssl_openssl.cpp", "src/modules/m_ssl_openssl.cpp" or print STDERR "Symlink failed: $!";
}
- getmodules();
$failed = 0;
- if ($interactive)
+ if ($interactive && $config{CERTGEN} eq 'y')
{
unless (-r "$config{CONFIG_DIR}/key.pem" && -r "$config{CONFIG_DIR}/cert.pem") {
print "SSL Certificates Not found, Generating.. \n\n
print "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++")) {
# 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>);
# 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 = "-shared";
+ $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
$config{LDLIBS} .= " -lsocket -lnsl -lrt -lresolv -pthread";
return "Solaris";
}
-
+
if($config{OSNAME} =~ /MINGW32/i)
{
# All code is position-independent on windows
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";
# 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);
if (defined(opendir(MDIRHANDLE, "src/modules/$name2"))) {
closedir(MDIRHANDLE);
$modules .= "$name2.so ";
- $uninstall_list = $uninstall_list . " -rm \$(MODULES)/$name2.so\n";
+ $uninstall_list = $uninstall_list . " -rm \$(MODPATH)/$name2.so\n";
}
}
}
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 (<FILEHANDLE>) {
- $tmp .= $_;
- }
+ $_ = join '', <FILEHANDLE>;
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);
###
print FILEHANDLE <<EOF;
###################################################
-# Copyright 2002-2007 The InspIRCd Development Team
-# http://www.inspircd.org/wiki/index.php/Credits
+# Copyright 2002-2009 The InspIRCd Development Team
+# http://wiki.inspircd.org/Credits
#
# Thanks to Andrew Church <achurch\@achurch.org>
# for assisting with making this work right.
$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
###
}
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";
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 . " \$(RUNCC) -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 = " \$(RUNCC) -dynamic -bind_at_load -L. -o inspircd \$(LDLIBS) inspircd.o "
}
else
{
$libraryext = "so";
- $binary_rule = " \@../make/run-cc.pl \$(CC) -pipe -I../include \$(FLAGS) $freebsd4libs -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) ";
+ $binary_rule = " \$(RUNCC) \$(FLAGS) $freebsd4libs -rdynamic -L. -o inspircd \$(LDLIBS) ";
}
open(FH,">src/Makefile") or die("Could not write src/Makefile");
- print FH <<EOM;
+ print FH <<'EOM';
+
+CXXFLAGS = ${FLAGS}
+CPPFILES = $(shell /bin/ls -l modes/ | grep '\.cpp' | sed 's/^.* //' | grep -v svn)
+RELCPPFILES = $(shell /bin/ls -l modes/ | grep '\.cpp' | sed 's/^.* /modes\//' | grep -v svn)
-CC = im a cheezeball
-CXXFLAGS = -I../include \${FLAGS}
-CPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* //' | grep -v svn)
-RELCPPFILES = \$(shell /bin/ls -l modes/ | grep '\\.cpp' | sed 's/^.* /modes\\//' | grep -v svn)
+all:
+ @echo "Don't run make here! Run it in the parent directory"
+ false
EOM
if (exists($core_files_list{$cpp}))
{
- # core files are statically linked into the binary and do not require -export-dynamic
- $buildstring = $buildstring . " \@../make/run-cc.pl \$(CC) -pipe -I../include \$(FLAGS) -c $rawcpp\n";
+ # core files are statically linked into the binary and do not require $SHARED shared libs switches
+ $buildstring = $buildstring . " \$(RUNCC) \$(FLAGS) -c $rawcpp\n";
}
else
{
- $buildstring = $buildstring . " \@../make/run-cc.pl \$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c $rawcpp\n";
+ $buildstring = $buildstring . " \$(RUNCC) \$(FLAGS) $SHARED -c $rawcpp\n";
}
if (exists($extrabuildlines{$cpp}))
}
}
- print FH "all: inspircd moo\n\n\n";
-
- $deps = calcdeps("src/inspircd.cpp");
- print FH "inspircd: inspircd.cpp $deps $all_core\n";
+ print FH "inspircd: $all_core\n";
print FH "$binary_rule $all_core\n\n";
print FH $buildstring;
- print FH "moo:\n \@\${MAKE} -C \"commands\" DIRNAME=\"src/commands\" CC=\"\$(CC)\" \$(MAKEARGS)\n\n";
+ print FH <<'EOM';
+
+.PHONY: all commands
+
+commands:
+ @${MAKE} -C commands $(MAKEARGS) commands
+
+modes/modeclasses.a: $(RELCPPFILES) ../include/inspircd.h ../include/inspircd_config.h
+ @${MAKE} -C modes $(MAKEARGS) CPPFILES="$(CPPFILES)" modeclasses.a
+
+EOM
# close main makefile
close(FH);
# and now reopen the commands makefile
open(FH,">src/commands/Makefile") or die("Could not write src/commands/Makefile");
print FH <<ITEM;
-CC = i am cornholio
-CXXFLAGS = -I../../include \${FLAGS}
+CXXFLAGS = \${FLAGS}
+
+all:
+ \@echo "Don't run make here! Run it in the root directory"
+ false
-all: $cmdobjs
+.PHONY: all commands
+commands: $cmdobjs
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
+ \$(RUNCC) \$(FLAGS) $SHARED -o cmd_$cmd.so cmd_$cmd.cpp
ITEM
}