diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2005-09-27 14:43:38 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2005-09-27 14:43:38 +0400 |
| commit | 38e7310f17c56867163b826b0efab57d14574448 (patch) | |
| tree | 37b8884b8533b42224b5ce0ea1371699db160015 /configure.in | |
| parent | bfcaf87451613c6c75aa511a34ee07aa66dcdf31 (diff) | |
* configure.in (CROSS_COMPILING): New automake conditional.
($mcsdir/build/config.make): Don't clobber when cross-compiling.
(GLIB_CFLAGS, GLIB_LIBS, GMODULE_CFLAGS, GMODULE_LIBS):
Define even when cross-compiling.
* mono/mini/Makefile.am ($(arch_built)) [CROSS_COMPILING]: Error out.
svn path=/trunk/mono/; revision=50843
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 2478197016e..297372792a7 100644 --- a/configure.in +++ b/configure.in @@ -253,6 +253,8 @@ AC_SUBST(CC_FOR_BUILD) AC_SUBST(HOST_CC) AC_SUBST(BUILD_EXEEXT) +AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes]) + # Set STDC_HEADERS AC_HEADER_STDC AC_LIBTOOL_WIN32_DLL @@ -398,19 +400,17 @@ GLIB_REQUIRED_VERSION=1.3.11 PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION) -if test "x$cross_compiling" = "xno"; then - GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0` - GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0` - GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0` - GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0` -fi +GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0` +GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0` +GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0` +GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0` AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) -if test x$platform_win32 = xyes -a x$cross_compiling = xno; then +if test x$cross_compiling$platform_win32 = xnoyes; then AC_MSG_CHECKING(for cygwin glib2-dev package) if [ cygcheck --f /usr/lib/libglib-2.0.dll.a | grep -q glib2-devel ]; then AC_MSG_RESULT(found) |