Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.in6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f4b8713cd6..6f36e4c81d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-05 Jeffrey Stedfast <fejj@gnome.org>
+
+ * configure.in: Instead of generating conftest.cs and conftest.exe
+ for the monoquery configure tests, use myconftest.cs and
+ myconftest.exe so that autoconf doesn't get confused and think
+ that the system c compiler outputs .exe's.
+
2007-06-04 Jeffrey Stedfast <fejj@novell.com>
* configure.in: AM_CONDITIONAL()s always need to be run.
diff --git a/configure.in b/configure.in
index 1dccb0a79a..04a93c7409 100644
--- a/configure.in
+++ b/configure.in
@@ -197,7 +197,7 @@ enable_sybase=no
if test "x$enable_monoquery" == "xyes"; then
monoquery_try_compile () {
- cat <<EOF | sed -e "s/\${Dbase}/${Dbase}/g" -e "s/\${Using}/${Using}/g" > conftest.cs
+ cat <<EOF | sed -e "s/\${Dbase}/${Dbase}/g" -e "s/\${Using}/${Using}/g" > myconftest.cs
using System;
using System.Data;
using System.Collections;
@@ -214,14 +214,14 @@ namespace Autoconf.Try.Compile {
}
}
EOF
- $CSC conftest.cs -r:System.Data $ExtraDbAssemblies > /dev/null 2>&1
+ $CSC myconftest.cs -r:System.Data $ExtraDbAssemblies > /dev/null 2>&1
if test $? == 0; then
my_ac_conftest_result="yes"
monoquery_avail=`expr $monoquery_avail + 1`
else
my_ac_conftest_result="no"
fi
- rm -f conftest.cs
+ rm -f myconftest.cs myconftest.exe
}
AC_MSG_CHECKING([for PostgreSQL support])