X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=41b0cd0ee82e190aa68876627a1c8e847cd24323;hb=a8878569083bfa4753e9e118adee0ed1da6a0325;hp=0a9c2b6fbfac9b7abcc59510931fc0fecf6f6fda;hpb=c32734fb23bb7c811076d1f4acc819020533e89c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 0a9c2b6fb..41b0cd0ee 100755
--- a/configure
+++ b/configure
@@ -46,8 +46,7 @@ our ($opt_use_gnutls, $opt_rebuild, $opt_use_openssl, $opt_nointeractive, $opt_p
     $opt_epoll, $opt_kqueue, $opt_noports, $opt_noepoll, $opt_nokqueue,
     $opt_noipv6, $opt_maxbuf, $opt_disable_debug, $opt_freebsd_port);
 
-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 ();
 
@@ -77,7 +76,6 @@ 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(); },
@@ -101,7 +99,6 @@ if (scalar(@opt_enableextras) + scalar(@opt_disableextras) > 0) {
 }
 
 our $non_interactive = (
-	(defined $opt_library_dir) ||
 	(defined $opt_base_dir) ||
 	(defined $opt_config_dir) ||
 	(defined $opt_module_dir) ||
@@ -127,9 +124,9 @@ 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)
 {
@@ -139,7 +136,7 @@ if (defined $opt_base_dir)
 $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{LIBRARY_DIR}	= resolve_directory($config{BASE_DIR}."/lib");		# Library Directory
+$config{BUILD_DIR}	 = resolve_directory($config{ME}."/build");         # Build Directory
 
 if (defined $opt_config_dir)
 {
@@ -153,10 +150,6 @@ if (defined $opt_binary_dir)
 {
 	$config{BINARY_DIR} = $opt_binary_dir;
 }
-if (defined $opt_library_dir)
-{
-	$config{LIBRARY_DIR} = $opt_library_dir;
-}
 chomp($config{HAS_GNUTLS}   = `pkg-config --modversion gnutls 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version.
 
 if (defined $opt_freebsd_port)
@@ -611,13 +604,12 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
 		$config{CONFIG_DIR}	 = resolve_directory($config{BASE_DIR}."/conf");	   # Configuration Dir
 		$config{MODULE_DIR}	 = resolve_directory($config{BASE_DIR}."/modules");	# Modules Directory
 		$config{BINARY_DIR}	 = resolve_directory($config{BASE_DIR}."/bin");	    # Binary Directory
-		$config{LIBRARY_DIR}	= resolve_directory($config{BASE_DIR}."/lib");	    # Library Directory
 	}
 
 	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 the IRCd libraries to be placed", "LIBRARY_DIR");
+	dir_check("do you want the build to take place", "BUILD_DIR");
 
 	my $chose_hiperf = 0;
 	if ($has_kqueue) {
@@ -933,10 +925,8 @@ sub writefiles {
 #define CoreExport /**/
 #define DllExport /**/
 
-#define CONFIG_FILE "$config{CONFIG_DIR}/inspircd.conf"
 #define MOD_PATH "$config{MODULE_DIR}"
 #define SOMAXCONN_S "$config{_SOMAXCONN}"
-#define LIBRARYDIR "$config{LIBRARY_DIR}"
 #define ENTRYPOINT int main(int argc, char** argv)
 
 EOF
@@ -1004,18 +994,6 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
 		print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n\n#endif\n";
 		close(FILEHANDLE);
 
-		open(FILEHANDLE, ">include/inspircd_se_config.h.tmp");
-		print FILEHANDLE <<EOF;
-/* Auto generated by configure, do not modify or commit to svn! */
-#ifndef __CONFIGURATION_SOCKETENGINE__
-#define __CONFIGURATION_SOCKETENGINE__
-
-#include "socketengines/$config{SOCKETENGINE}.h"
-
-#endif
-EOF
-		close(FILEHANDLE);
-
 		open(FILEHANDLE, ">include/inspircd_version.h.tmp");
 		print FILEHANDLE <<EOF;
 #define VERSION "$version"
@@ -1024,7 +1002,7 @@ EOF
 EOF
 		close FILEHANDLE;
 
-		for my $file (qw(include/inspircd_config.h include/inspircd_se_config.h include/inspircd_version.h)) {
+		for my $file (qw(include/inspircd_config.h include/inspircd_version.h)) {
 			my $diff = 0;
 			open my $fh1, $file or $diff = 1;
 			open my $fh2, $file.'.tmp' or die "Can't read $file.tmp that we just wrote: $!";
@@ -1083,9 +1061,12 @@ EOF
 			close(FILEHANDLE);
 
 			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 LIBRARY_DIR
-				STARTSCRIPT DESTINATION EXTRA_DIR SOCKETENGINE CORE_FLAGS
+				CC SYSTEM BASE_DIR CONFIG_DIR MODULE_DIR BINARY_DIR BUILD_DIR
+				STARTSCRIPT DESTINATION EXTRA_DIR SOCKETENGINE
 			)) {
 				s/\@$var\@/$config{$var}/g;
 			}