In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index cb861e4e5f1537dd0b096f1456870b601d5b4f2e..4b6567d7dc5a943810e81fd73cb4511e2d1e585d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -478,6 +478,16 @@ mcs_topdir=$(cd "$srcdir/$mcsdir" && pwd)
 mcs_topdir_from_srcdir='$(top_builddir)'/$mcsdir
 fi
 
+# Convert mcs_topdir* paths to Windows syntax.
+if test x$cross_compiling$host_win32 = xnoyes; then
+  mcs_topdir=$(cygpath -m $mcs_topdir)
+  case $mcs_topdir_from_srcdir in
+    /cygdrive/*)
+       mcs_topdir_from_srcdir=$(cygpath -m $mcs_topdir_from_srcdir)
+       ;;
+  esac
+fi
+
 ## Maybe should also disable if mcsdir is invalid.  Let's punt the issue for now.
 AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_build != xno])
 
@@ -519,10 +529,7 @@ yes|sibling) libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la ;;
 esac
 AC_SUBST([libgdiplus_loc])
 
-PKG_PROG_PKG_CONFIG()
-if test "x$PKG_CONFIG" = "x"; then
-       AC_MSG_ERROR([You need to install pkg-config])
-fi
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
 pkg_config_path=
 AC_ARG_WITH(crosspkgdir, [  --with-crosspkgdir=/path/to/pkg-config/dir      Change pkg-config dir to custom dir],
@@ -557,8 +564,11 @@ embedded)
   eglib_dir=eglib
   ;;
 system)
-    echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH"
-    echo "cross_compiling=$cross_compiling"
+  if test "x$PKG_CONFIG" = "xno"; then
+    AC_MSG_ERROR([You need to install pkg-config])
+  fi
+  echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH"
+  echo "cross_compiling=$cross_compiling"
   BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
   BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
   
@@ -568,6 +578,9 @@ system)
   dnl
   dnl No, you will not replace this check with a pkg.m4 check
   dnl
+  if test "x$PKG_CONFIG" = "xno"; then
+    AC_MSG_ERROR([You need to install pkg-config])
+  fi
   if $PKG_CONFIG --atleast-version=$GLIB_REQUIRED_VERSION glib-2.0; then
       GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
       GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
@@ -1525,7 +1538,7 @@ if test x$target_win32 = xno; then
        dnl *********************************
        dnl *** Checks for math functions ***
        dnl *********************************
-        LIBS="$LIBS -lm";
+       AC_SEARCH_LIBS(sqrtf, m)
        if test "x$has_broken_apple_cpp" != "xyes"; then
                AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
                        AC_TRY_LINK([#include <math.h>], 
@@ -2020,6 +2033,10 @@ if test "x$enable_llvm" = "xyes"; then
    llvm_version=`$LLVM_CONFIG --version`
    major_version=`echo $llvm_version | cut -c 1`
    minor_version=`echo $llvm_version | cut -c 3`
+   if echo $llvm_version | grep -q 'mono'; then
+         AC_DEFINE(LLVM_MONO_BRANCH, 1, [Whenever we are using the mono branch of LLVM])
+         LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MONO_BRANCH"       
+   fi
 
    AC_DEFINE_UNQUOTED(LLVM_MAJOR_VERSION, $major_version, [Major version of LLVM libraries])
    AC_DEFINE_UNQUOTED(LLVM_MINOR_VERSION, $minor_version, [Minor version of LLVM libraries])
@@ -2364,10 +2381,14 @@ case "$host" in
     *-*-*freebsd*)
        LIBC="libc.so"
        INTL="libintl.so"
+       SQLITE="libsqlite.so"
+       SQLITE3="libsqlite3.so"
        ;;
     *-*-*openbsd*)
        LIBC="libc.so"
        INTL="libintl.so"
+        SQLITE="libsqlite.so"
+        SQLITE3="libsqlite3.so"
        ;;
     *-*-*linux*)
        AC_PATH_X