From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sun, 14 Jan 2007 02:19:27 +0000 (+0000)
Subject: Fix broken ./configure macros broken by introduction of an eval
X-Git-Tag: v2.0.23~6070
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=f6f45af59e8cd572e724d95f3736f6a60f73486c;p=user%2Fhenk%2Fcode%2Finspircd.git

Fix broken ./configure macros broken by introduction of an eval


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6316 e03df62e-2008-0410-955e-edbf42e46eb7
---

diff --git a/configure b/configure
index 0ed5100bd..9cdccdca5 100755
--- a/configure
+++ b/configure
@@ -1491,6 +1491,8 @@ HEADER
 			$liflags = getlinkerflags("src/modules/m_".$i.".cpp");
 			$deps = getdependencies("src/modules/m_".$i.".cpp");
 
+			#print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
+
 			###
 			# Write Entry to the Makefile
 			###
@@ -1564,6 +1566,9 @@ EOF
 	$cmflags = getcompilerflags("src/modules/m_".$i.".cpp");
 	$liflags = getlinkerflags("src/modules/m_".$i.".cpp");
 	$deps = getdependencies("src/modules/m_".$i.".cpp");
+
+	#print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
+
 	print FILEHANDLE <<EOCHEESE;
 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
 	\$(CC) -pipe -I../../include \$(FLAGS) $cmflags -export-dynamic -c m_$i.cpp
diff --git a/make/utilities.pm b/make/utilities.pm
index fac0cb356..dc755c63f 100644
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -123,9 +123,10 @@ sub pkgconfig_get_lib_dirs($$$;$)
 # to functions within these modules at configure time.
 sub translate_functions($$)
 {
+	my ($line,$module) = @_;
+
 	eval
 	{
-		my ($line,$module) = @_;
 		$module =~ /modules*\/(.+?)$/;
 		$module = $1;
 
@@ -185,13 +186,16 @@ sub translate_functions($$)
 			my $replace = make_rpath($1,$module);
 			$line =~ s/rpath\("(.+?)"\)/$replace/;
 		}
-		return $line;
 	};
 	if ($@)
 	{
 		print "\n\nConfiguration failed. The following error occured:\n\n$@\n";
 		exit;
 	}
+	else
+	{
+		return $line;
+	}
 }
 
 1;