[m-rev.] diff: configure working with gcc -mno-cygwin

[Peter Ross]

Hi,


===================================================================


Estimated hours taken: 2
Branches: main

configure.in:
	Avoid problems \r in the output when using
	"gcc -mno-cygwin" as the C compiler causing
	configure to fail.


Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.480
diff -U5 -r1.480 configure.in
--- configure.in	28 Nov 2006 06:57:41 -0000	1.480
+++ configure.in	29 Nov 2006 03:34:38 -0000
@@ -1395,10 +1395,11 @@
 	}],
 	[mercury_cv_word_type=`cat conftest.tags`],
 	[mercury_cv_word_type=unknown],
 	[mercury_cv_word_type=unknown])
 fi
+mercury_cv_word_type=`echo $mercury_cv_word_type | tr -d '\r'`
 AC_MSG_RESULT($mercury_cv_word_type)
 AC_DEFINE_UNQUOTED(MR_WORD_TYPE, $mercury_cv_word_type)
 MR_WORD_TYPE=$mercury_cv_word_type
 AC_SUBST(MR_WORD_TYPE)
 
@@ -1508,10 +1509,11 @@
 	}],
 	[mercury_cv_int_least32_type=`cat conftest.tags`],
 	[mercury_cv_int_least32_type=unknown],
 	[mercury_cv_int_least32_type=unknown])
 )
+mercury_cv_int_least32_type=`echo $mercury_cv_int_least32_type | tr -d '\r'`
 AC_MSG_RESULT($mercury_cv_int_least32_type)
 AC_DEFINE_UNQUOTED(MR_INT_LEAST32_TYPE, $mercury_cv_int_least32_type)
 MR_INT_LEAST32_TYPE=$mercury_cv_int_least32_type
 AC_SUBST(MR_INT_LEAST32_TYPE)
 
@@ -1569,10 +1571,11 @@
 	}],
 	[mercury_cv_int_least16_type=`cat conftest.tags`],
 	[mercury_cv_int_least16_type=unknown],
 	[mercury_cv_int_least16_type=unknown])
 )
+mercury_cv_int_least16_type=`echo $mercury_cv_int_least16_type | tr -d '\r'`
 AC_MSG_RESULT($mercury_cv_int_least16_type)
 AC_DEFINE_UNQUOTED(MR_INT_LEAST16_TYPE, $mercury_cv_int_least16_type)
 MR_INT_LEAST16_TYPE=$mercury_cv_int_least16_type
 AC_SUBST(MR_INT_LEAST16_TYPE)
 

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------