'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,
sub clean
{
- system("rm -rf .config.cache");
+ unlink(".config.cache");
}
sub update
exit 0;
} else {
# We've Loaded the cache file and all our variables..
- print "Updating Files..\n";
+ print "Updating files...\n";
getosflags();
if ($opt_disable_debug == 1)
{
exit 0;
} else {
# We've Loaded the cache file and all our variables..
- print "Updating Files..\n";
+ print "Updating files...\n";
getosflags();
$has_epoll = $config{HAS_EPOLL};
$has_ports = $config{HAS_PORTS};
$config{HAS_KQUEUE} = $has_kqueue;
printf "Checking for libgnutls... ";
-if (($config{HAS_GNUTLS}) && (($config{HAS_GNUTLS} >= 1.2) || ($config{HAS_GNUTLS} eq "y"))) {
+if (($config{HAS_GNUTLS}) || ($config{HAS_GNUTLS} eq "y")) {
print "yes\n";
$config{HAS_GNUTLS} = "y";
} else {
}
printf "Checking for openssl... ";
-if (($config{HAS_OPENSSL}) && (($config{HAS_OPENSSL} >= 0.8) || ($config{HAS_OPENSSL} eq "y"))) {
+if (($config{HAS_OPENSSL}) || ($config{HAS_OPENSSL} eq "y")) {
print "yes\n";
$config{HAS_OPENSSL} = "y";
} else {
$config{LDLIBS} = "-lstdc++";
$config{FLAGS} = "-fPIC -Wall -pedantic $config{OPTIMISATI}";
- $config{DEVELOPER} = "-fPIC -Wall -std=c99 -pedantic -g";
- $SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared";
+ $config{DEVELOPER} = "-fPIC -Wall -pedantic -g";
+ $SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared" unless defined $opt_disablerpath;
$config{MAKEPROG} = "make";
if ($config{OSNAME} =~ /darwin/i) {
else
{
$libraryext = "so";
- $othercrap = " \$(CC) -pipe -I../include -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) $freebsd4libs -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) ";
+ $RPATH = "-Wl,--rpath -Wl,$config{LIBRARY_DIR}" unless defined $opt_disablerpath;
+ $othercrap = " \$(CC) -pipe -I../include $RPATH \$(FLAGS) $freebsd4libs -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) ";
}
foreach my $cpp (sort keys %filelist)
}
else
{
- $libcrap = "-Wl,--rpath -Wl," . $config{LIBRARY_DIR} . " -shared";
+ if (defined $opt_disablerpath)
+ {
+ $libcrap = " -shared";
+ }
+ else
+ {
+ $libcrap = "-Wl,--rpath -Wl," . $config{LIBRARY_DIR} . " -shared";
+ }
}
$deps = calcdeps("src/$cpp");
if (exists($extrasources{$cpp}))