X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=cd21375b5dd06557f0d977a858a982a6bb51d28b;hb=db3d6ae62dd235b484b02ad787fe3d38c9e50675;hp=514ddee81d5bae22ad23d8159e72a0d447c798cf;hpb=9a09770a5433c3867e8cb2014a48e9624c82fccf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 514ddee81..cd21375b5 100755
--- a/configure
+++ b/configure
@@ -139,7 +139,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 +153,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 +607,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,11 +928,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 OPTIMISATION $config{OPTIMITEMP}
-#define LIBRARYDIR "$config{LIBRARY_DIR}"
 #define ENTRYPOINT int main(int argc, char** argv)
 
 EOF
@@ -1005,18 +997,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"
@@ -1025,7 +1005,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: $!";
@@ -1084,9 +1064,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;
 			}