X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=eglib%2Fconfigure.ac;h=5434ac63f58013a1c9cf7841b16c7472cd1e09a8;hb=e698ebe6355598c0a4a52338dd5cacfce2a2d9d7;hp=97bda04e122c6ce98fe929a92a064a308c35934f;hpb=9975a45f43793e34318e593ddacd3f332f8d91c0;p=mono.git

diff --git a/eglib/configure.ac b/eglib/configure.ac
index 97bda04e122..5434ac63f58 100644
--- a/eglib/configure.ac
+++ b/eglib/configure.ac
@@ -2,7 +2,7 @@ AC_INIT(README)
 AC_CANONICAL_SYSTEM
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(eglib,0.1)
+AM_INIT_AUTOMAKE(eglib,0.2)
 AM_MAINTAINER_MODE
 
 AC_PROG_CC
@@ -11,11 +11,11 @@ CFLAGS='-g -O0 -D_GNU_SOURCE'
 AC_SUBST(CFLAGS)
 GNUC_PRETTY=
 GNUC_UNUSED=
-BREAKPOINT="G_STMT_START { } G_STMT_END"
+BREAKPOINT="G_STMT_START { raise (SIGTRAP); } G_STMT_END"
 if test x$GCC = xyes; then
    GNUC_UNUSED='__attribute__((__unused__))'
    GNUC_NORETURN='__attribute__((__noreturn__))'
-   echo targte_cpu=$target_cpu
+   echo target_cpu=$target_cpu
    case $target_cpu in
      i*86) BREAKPOINT="G_STMT_START { __asm__ (\"int \$03\"); } G_STMT_END" ;;
    esac
@@ -25,6 +25,7 @@ AC_SUBST(GNUC_UNUSED)
 AC_SUBST(GNUC_NORETURN)
 AC_SUBST(BREAKPOINT)
 
+AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes])
 AC_C_BIGENDIAN([ORDER=G_BIG_ENDIAN],[ORDER=G_LITTLE_ENDIAN])
 AC_SUBST(ORDER)
 
@@ -41,13 +42,29 @@ case $host in
     ;;
 esac
 
+case $target in
+arm*-darwin*)
+    CFLAGS="$CLAFGS -U_FORTIFY_SOURCE"
+    ;;
+esac
+
 AC_SUBST(PATHSEP)
 AC_SUBST(SEARCHSEP)
 AC_SUBST(OS)
+AM_CONDITIONAL(PLATFORM_WIN32, test x$OS = xWIN32)
 
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(void *)
-AC_CHECK_FUNCS(strlcpy)
+AC_CHECK_FUNCS(strndup strlcpy getpwent_r strtok_r)
+AC_CHECK_LIB(iconv, libiconv_open, LIBS="$LIBS -liconv")
+old_ldflags="${LDFLAGS}"
+LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
+AC_TRY_LINK(, [int i;], found_export_dynamic=yes, found_export_dynamic=no)
+if test $found_export_dynamic = no; then
+	LDFLAGS="${old_ldflags}"
+fi
+
+AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h)
 
 if test $ac_cv_sizeof_void_p != $ac_cv_sizeof_int; then
    GPOINTER_TO_INT="((gint)(long) (ptr))"
@@ -66,6 +83,11 @@ else
    GSIZE_FORMAT='"u"'
    G_GUINT64_FORMAT='"llu"'
 fi
+
+PKG_CHECK_MODULES(GLIB, glib-2.0,
+	[AM_CONDITIONAL(HAVE_GLIB, test x = x)],
+	[AM_CONDITIONAL(HAVE_GLIB, test x = y)]
+	)
 AC_SUBST(GPOINTER_TO_INT)
 AC_SUBST(GPOINTER_TO_UINT)
 AC_SUBST(GINT_TO_POINTER)