From 6f65b7c6ca13c1cee4b5f605d38978224c6edeb7 Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Mon, 13 Oct 2014 21:44:13 +0100
Subject: Add a workaround for compiling modules with Windows line endings.

---
 make/configure.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/make/configure.pm b/make/configure.pm
index f877846fc..9b8e2d0e4 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -81,7 +81,7 @@ sub getcompilerflags {
 	my ($file) = @_;
 	open(FLAGS, $file) or return "";
 	while (<FLAGS>) {
-		if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) {
+		if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/\r?$/) {
 			my $x = translate_functions($1, $file);
 			next if ($x eq "");
 			close(FLAGS);
@@ -96,7 +96,7 @@ sub getlinkerflags {
 	my ($file) = @_;
 	open(FLAGS, $file) or return "";
 	while (<FLAGS>) {
-		if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/$/) {
+		if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/\r?$/) {
 			my $x = translate_functions($1, $file);
 			next if ($x eq "");
 			close(FLAGS);
@@ -111,7 +111,7 @@ sub getdependencies {
 	my ($file) = @_;
 	open(FLAGS, $file) or return "";
 	while (<FLAGS>) {
-		if ($_ =~ /^\/\* \$ModDep: (.+) \*\/$/) {
+		if ($_ =~ /^\/\* \$ModDep: (.+) \*\/\r?$/) {
 			my $x = translate_functions($1, $file);
 			next if ($x eq "");
 			close(FLAGS);
@@ -126,7 +126,7 @@ sub nopedantic {
 	my ($file) = @_;
 	open(FLAGS, $file) or return "";
 	while (<FLAGS>) {
-		if ($_ =~ /^\/\* \$NoPedantic \*\/$/) {
+		if ($_ =~ /^\/\* \$NoPedantic \*\/\r?$/) {
 			my $x = translate_functions($_, $file);
 			next if ($x eq "");
 			close(FLAGS);
-- 
cgit v1.2.3