X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=ef17e9bb350024db87fde6295a916e427c671daf;hb=4ac0ccc06ce0cafea2549f51881cba0c44463d9c;hp=fcd509fafdb25b7ea1954f8bb813382097534bed;hpb=283cb86e5d0ab8b463d50934fb22a8774d83faf4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index fcd509faf..ef17e9bb3 100755
--- a/configure
+++ b/configure
@@ -43,7 +43,7 @@ chomp($config{GCCVER}       = `gcc -dumpversion | cut -c 1`);   		# Major GCC Ve
 chomp($config{GCC34}        = `gcc -dumpversion | cut -c 3`);   		# Minor GCC Version
 chomp($config{OSNAME}       = `/bin/uname`);                      		# Operating System Name
 $config{CC} 		    = "g++";						# C++ compiler
-$config{MAKEORDER}	    = "ircd mods config bininst";			# build order
+$config{MAKEORDER}	    = "ircd mods";					# build order
 $config{STATICLIBS}         = "";						# library archive path
 $config{MAX_IDENT}          = "12";						# max ident size
 $config{MAX_QUIT}           = "255";						# max quit message size
@@ -175,13 +175,7 @@ $has_epoll = 0;
 $fail = 0;
 open(EPOLL, "</usr/include/sys/epoll.h") or $fail = 1;
 if (!$fail) {
-	while (chomp($line = <EPOLL>)) {
-		# try and find the declaration of:
-		# extern int epoll_create (int __size) __THROW;
-		if (($line =~ /int(\0x9|\s)+epoll_create(\0x9|\s)+\(/) || ($line =~ /int(\0x9|\s)+epoll_create\(/)) {
-			$has_epoll = 1;
-		}
-	}
+	$has_epoll = 1;
 	close(EPOLL);
 }
 if ($has_epoll) {
@@ -822,12 +816,12 @@ sub getosflags {
 			$config{FLAGS}  = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
 			$config{LDLIBS} = "";
 			$config{MAKEPROG} = "/usr/bin/make";
-			$config{MAKEORDER} = "ircd mods config bininst";
+			$config{MAKEORDER} = "ircd mods";
 		} elsif ($config{OSNAME} eq "CYG-STATIC") {
 			$config{FLAGS} = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}";
 			$config{LDLIBS} = "";
 			$config{MAKEPROG} = "/usr/bin/make";
-			$config{MAKEORDER} = "mods ircd config bininst";
+			$config{MAKEORDER} = "mods ircd";
 			$config{STATICLIBS} = "modules/mods.a";
 			$config{STATIC_LINK} = "yes";
 		}
@@ -873,7 +867,10 @@ sub writefiles {
 	print "Writing \033[1;32minspircd_config.h\033[0m\n";
 	# First File.. inspircd_config.h
 	chomp(my $incos = `uname -n -s -r`);
-	chomp(my $version = `sh ./src/version.sh` + " (r" + `./src/svn-rev.sh` + ")");
+	chomp(my $version = `sh ./src/version.sh`);
+        chomp(my $revision = `./src/svn-rev.sh`);
+	$version = "$version(r$revision)";
+	chomp(my $revision2 = `./src/svn-rev.sh`);
 	open(FILEHANDLE, ">include/inspircd_config.h");
 	my $NL = $config{NICK_LENGT}+1;
 	my $CL = $config{CHAN_LENGT}+1;
@@ -885,6 +882,7 @@ sub writefiles {
 #define CONFIG_FILE "$config{CONFIG_DIR}/inspircd.conf"
 #define MOD_PATH "$config{MODULE_DIR}"
 #define VERSION "$version"
+#define REVISION "$revision2"
 #define MAXCLIENTS $config{MAX_CLIENT}
 #define MAX_DESCRIPTORS $config{MAX_DESCRIPTORS}
 #define NICKMAX $NL
@@ -1211,6 +1209,7 @@ EOF
 	my $modules = "";
 	my $cmflags = "";
 	my $liflags = "";
+	my $crud = "";
 
 	foreach $i (@modlist) {
 	###
@@ -1222,14 +1221,14 @@ EOF
 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/inspircd_io.h
 	\$(CC) -pipe -I../../include \$(FLAGS) $cmflags -export-dynamic -c m_$i.cpp
 	\$(CC) \$(FLAGS) -shared $liflags -o m_$i.so m_$i.o $extra
-	\@-rm -f \$(MODPATH)/m_$i.so
-	install -v -m 0700 m_$i.so \$(MODPATH)
 
 EOCHEESE
+	$crud = $crud . "	install -v -m 0700 m_$i.so \$(MODPATH)\n";
 	###
 	# End Write Entry to the MakeFile
 	###
 	}
+	print FILEHANDLE "modinst:\n	\@echo \"Installing modules...\"\n" . $crud;
 }