X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=eglib%2Fconfigure.ac;h=75ba30a3de637e30747974bce4892794984d5c21;hb=a7a53aee8eda62da8da8581aa82885f695f2cc44;hp=a016d731763ee50090f82196091620174e73713b;hpb=98a764c554126182bc9dae6ee2cd497e7900643c;p=mono.git

diff --git a/eglib/configure.ac b/eglib/configure.ac
index a016d731763..75ba30a3de6 100644
--- a/eglib/configure.ac
+++ b/eglib/configure.ac
@@ -2,25 +2,21 @@ AC_INIT(README)
 AC_CANONICAL_SYSTEM
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(eglib,0.1)
+AM_INIT_AUTOMAKE(eglib,0.3)
 AM_MAINTAINER_MODE
 
 AC_PROG_CC
 AM_PROG_LIBTOOL
-CFLAGS='-g -O0'
-AC_SUBST(CFLAGS)
-
+CFLAGS="$CFLAGS -g -O0 -D_GNU_SOURCE"
 GNUC_PRETTY=
 GNUC_UNUSED=
-BREAKPOINT=
+BREAKPOINT="G_STMT_START { raise (SIGTRAP); } G_STMT_END"
 if test x$GCC = xyes; then
-   GNUC_PRETTY=__PRETTY_FUNCTION__
    GNUC_UNUSED='__attribute__((__unused__))'
    GNUC_NORETURN='__attribute__((__noreturn__))'
-   case $target in
-     i[3456]86-*)
-       BREAKPOINT="G_STMT_START { __asm__ ("int $03"); } G_STMT_END"
-     ;;
+   echo target_cpu=$target_cpu
+   case $target_cpu in
+     i*86) BREAKPOINT="G_STMT_START { __asm__ (\"int \$03\"); } G_STMT_END" ;;
    esac
 fi
 AC_SUBST(GNUC_PRETTY)
@@ -28,8 +24,17 @@ AC_SUBST(GNUC_UNUSED)
 AC_SUBST(GNUC_NORETURN)
 AC_SUBST(BREAKPOINT)
 
+# We use a separate variable to pass down CPPFLAGS and CFLAGS from the main mono 
+# configure, because of autoconf brokeness
+if test "x$CPPFLAGS_FOR_EGLIB" != "x"; then
+   CPPFLAGS=$CPPFLAGS_FOR_EGLIB
+fi
+if test "x$CFLAGS_FOR_EGLIB" != "x"; then
+   CFLAGS=$CFLAGS_FOR_EGLIB
+fi
+
+AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes])
 AC_C_BIGENDIAN([ORDER=G_BIG_ENDIAN],[ORDER=G_LITTLE_ENDIAN])
-AC_SUBST(ORDER)
 
 case $host in
 *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
@@ -44,12 +49,35 @@ case $host in
     ;;
 esac
 
+case $target in
+arm*-darwin*)
+    CFLAGS="$CFLAGS -U_FORTIFY_SOURCE"
+    ;;
+i*86-*-darwin*)
+    ORDER=G_LITTLE_ENDIAN
+    ;;
+esac
+
+AC_SUBST(ORDER)
+AC_SUBST(CFLAGS)
 AC_SUBST(PATHSEP)
 AC_SUBST(SEARCHSEP)
 AC_SUBST(OS)
+AM_CONDITIONAL(HOST_WIN32, test x$OS = xWIN32)
+AM_CONDITIONAL(TARGET_WIN32, test x$OS = xWIN32)
 
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(void *)
+AC_CHECK_FUNCS(strndup strlcpy getpwent_r strtok_r rewinddir)
+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))"
@@ -58,6 +86,7 @@ if test $ac_cv_sizeof_void_p != $ac_cv_sizeof_int; then
    GUINT_TO_POINTER="((gpointer)(gulong) (v))"
    GSIZE="long"
    GSIZE_FORMAT='"lu"'
+   G_GUINT64_FORMAT='"lu"'
 else
    GPOINTER_TO_INT="((gint) (ptr))"
    GPOINTER_TO_UINT="((guint) (ptr))"
@@ -65,17 +94,48 @@ else
    GUINT_TO_POINTER="((gpointer) (v))"
    GSIZE="int"
    GSIZE_FORMAT='"u"'
+   G_GUINT64_FORMAT='"llu"'
+fi
+
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test "x$PKG_CONFIG" = "xno"; then
+	AC_MSG_ERROR([You need to install pkg-config])
 fi
+
+pkg_config_path=
+AC_ARG_WITH(crosspkgdir, [  --with-crosspkgdir=/path/to/pkg-config/dir      Change pkg-config dir to custom dir],
+	if test x$with_crosspkgdir = "x"; then
+		if test -s $PKG_CONFIG_PATH; then
+			pkg_config_path=$PKG_CONFIG_PATH
+		fi
+	else
+		pkg_config_path=$with_crosspkgdir
+		PKG_CONFIG_PATH=$pkg_config_path
+		export PKG_CONFIG_PATH
+	fi
+)
+
+dnl
+dnl No, you can not replace the call below with a pkg.m4 macro
+dnl
+if $PKG_CONFIG --atleast-version=$GLIB_REQUIRED_VERSION glib-2.0; then
+    have_glib=true;
+else
+    have_glib=false;
+fi
+AM_CONDITIONAL(HAVE_GLIB, $have_glib)
+
 AC_SUBST(GPOINTER_TO_INT)
 AC_SUBST(GPOINTER_TO_UINT)
 AC_SUBST(GINT_TO_POINTER)
 AC_SUBST(GUINT_TO_POINTER)
 AC_SUBST(GSIZE)
 AC_SUBST(GSIZE_FORMAT)
+AC_SUBST(G_GUINT64_FORMAT)
 
 AC_OUTPUT([
 Makefile
 src/Makefile
 src/eglib-config.h
 test/Makefile
-])
\ No newline at end of file
+])