X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=5ff1fc49f08e7a98d7a029bcbeeeea8b92468128;hb=bb2cbd5df7eea9ece23c812f22ea4667415d323e;hp=e5ed2c766d8ff2cd5b525a55a4a60a4dc7df66e2;hpb=a3ea7ceb4d4f5e2cb8ea421313e8939640fb898c;p=mono.git

diff --git a/configure.in b/configure.in
index e5ed2c766d8..5ff1fc49f08 100644
--- a/configure.in
+++ b/configure.in
@@ -412,14 +412,14 @@ AC_ARG_WITH([glib],
 case $with_glib in
 embedded) 
   GLIB_CFLAGS='-I$(top_srcdir)/eglib/src'
-  GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib'
+  GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm'
+  BUILD_GLIB_CFLAGS="$GLIB_CFLAGS"
+  BUILD_GLIB_LIBS="$GLIB_LIBS"
   AC_CONFIG_SUBDIRS(eglib)
   ;;
 system)
   BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
   BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
-  AC_SUBST(BUILD_GLIB_CFLAGS)
-  AC_SUBST(BUILD_GLIB_LIBS)
 
   ## Versions of dependencies
   GLIB_REQUIRED_VERSION=1.3.11
@@ -434,11 +434,14 @@ system)
 *)
   AC_MSG_ERROR([Invalid argument to --with-glib.])
 esac
+AM_CONDITIONAL(EGLIB_BUILD, test x$with_glib = xembedded)
   
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
+AC_SUBST(BUILD_GLIB_CFLAGS)
+AC_SUBST(BUILD_GLIB_LIBS)
 
 if test x$cross_compiling$platform_win32 = xnoyes; then
    AC_MSG_CHECKING(for cygwin glib2-dev package)