switched to glib2.0, unicode support, bug fixes

svn path=/trunk/mono/; revision=1802

1 files changed, 27 insertions, 10 deletions

diff --git a/configure.in b/configure.in
index 2b22a75bc84..a28d2c00058 100644
--- a/configure.in
+++ b/configure.in
@@ -17,20 +17,19 @@ AC_CHECK_SIZEOF(void *)
 
 CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations'
 
-dnl ***************************
-dnl *** Checks for glib 1.2 ***
-dnl ***************************
-AM_PATH_GLIB(1.2.0,,
-             AC_MSG_ERROR([Cannot find GLIB: Is glib-config in path?]))
+## Versions of dependencies
+GLIB_REQUIRED_VERSION=1.3.11
 
-GLIB_CFLAGS=`glib-config --cflags glib`
-GLIB_LIBS=`glib-config --libs glib`
+PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
+
+GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0`
+GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0`
 
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-GMODULE_CFLAGS=`glib-config --cflags gmodule`
-GMODULE_LIBS=`glib-config --libs gmodule`
+GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0`
+GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0`
 
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
@@ -100,7 +99,6 @@ if test x$platform_win32 = xno; then
 			AC_DEFINE(HAVE_LARGE_FILE_SUPPORT)
 			CFLAGS="$CFLAGS $1"
 			large_offt=yes
-			break
 		], [
 			AC_MSG_RESULT(no)
 		])
@@ -201,6 +199,25 @@ if test x$platform_win32 = xno; then
 	])
 fi
 
+# check for new iconv version
+AC_MSG_CHECKING(for new iconv)
+AC_CACHE_VAL(new_iconv,[
+	AC_TRY_RUN([#include <stdio.h> 
+	        #include <iconv.h>
+ 
+		int main()
+		{
+		  exit (iconv_open ("UTF-16le", "UTF-8") == (iconv_t)-1);
+		}
+		],
+		new_iconv=yes)])
+if test -n "$new_iconv"; then
+   	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_NEW_ICONV)
+else
+	AC_MSG_RESULT(no)
+fi
+
 
 TARGET="unknown"
 ACCESS_UNALIGNED="yes"