Include alloca.h into glib.h if needed.

[mono.git] / eglib / configure.ac

diff --git a/eglib/configure.ac b/eglib/configure.ac
index 98a99144804999e1edd690b68beb6288fbae8c09..7d52c708efba2d3e2851c22fe4069c4a10aa4986 100644 (file)
--- a/eglib/configure.ac
+++ b/eglib/configure.ac
@@ -7,16 +7,17 @@ AM_MAINTAINER_MODE
 
 AC_PROG_CC
 AM_PROG_LIBTOOL
-CFLAGS="$CFLAGS -g -O0 -D_GNU_SOURCE"
+# Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
+DOLT
+CFLAGS="$CFLAGS -O0"
 GNUC_PRETTY=
 GNUC_UNUSED=
 BREAKPOINT="G_STMT_START { raise (SIGTRAP); } G_STMT_END"
 if test x$GCC = xyes; then
    GNUC_UNUSED='__attribute__((__unused__))'
    GNUC_NORETURN='__attribute__((__noreturn__))'
-   echo target_cpu=$target_cpu
-   case $target_cpu in
-     i*86) BREAKPOINT="G_STMT_START { __asm__ (\"int \$03\"); } G_STMT_END" ;;
+   case $host_cpu in
+     i*86|x86_64) BREAKPOINT="G_STMT_START { __asm__ (\"int \$03\"); } G_STMT_END" ;;
    esac
 fi
 AC_SUBST(GNUC_PRETTY)
@@ -33,15 +34,25 @@ if test "x$CFLAGS_FOR_EGLIB" != "x"; then
    CFLAGS=$CFLAGS_FOR_EGLIB
 fi
 
+CFLAGS="$CFLAGS -g -D_GNU_SOURCE"
+
 AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes])
 AC_C_BIGENDIAN([ORDER=G_BIG_ENDIAN],[ORDER=G_LITTLE_ENDIAN])
 
+platform_darwin=no
+
 case $host in
 *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
     PATHSEP='\\'
     SEARCHSEP=';'
     OS="WIN32"
     ;;
+*-*darwin*)
+    platform_darwin=yes
+    PATHSEP='/'
+    SEARCHSEP=':'
+    OS="UNIX"
+    ;;
 *)
     PATHSEP='/'
     SEARCHSEP=':'
@@ -75,6 +86,7 @@ AC_SUBST(SEARCHSEP)
 AC_SUBST(OS)
 AM_CONDITIONAL(HOST_WIN32, test x$OS = xWIN32)
 AM_CONDITIONAL(TARGET_WIN32, test x$OS = xWIN32)
+AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes)
 
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(void *)
@@ -82,6 +94,10 @@ AC_CHECK_FUNCS(strndup strlcpy getpwuid_r strtok_r rewinddir vasprintf)
 AM_CONDITIONAL(NEED_VASPRINTF, test x$have_vasprintf = x )
 AC_CHECK_LIB(iconv, iconv_open, LIBS="$LIBS -liconv")
 AC_CHECK_LIB(iconv, libiconv_open, LIBS="$LIBS -liconv")
+AC_CHECK_LIB(iconv, iconv_open, ICONV_LIBS="-liconv")
+AC_CHECK_LIB(iconv, libiconv_open, ICONV_LIBS="-liconv")
+AC_SUBST(ICONV_LIBS)
+LIBS="$LIBS $ICONV_LIBS"
 AC_SEARCH_LIBS(sqrtf, m)
 
 # nanosleep may not be part of libc, also search it in other libraries
@@ -110,7 +126,9 @@ if test "x$have_iso_varargs" = "xyes"; then
 fi
 AC_SUBST(G_HAVE_ISO_VARARGS)
 
-AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h)
+AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h)
+AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0])
+AC_SUBST(HAVE_ALLOCA_H)
 
 if test $ac_cv_sizeof_void_p != $ac_cv_sizeof_int; then
    GPOINTER_TO_INT="((gint)(long) (ptr))"
@@ -160,6 +178,7 @@ if test "x$PKG_CONFIG" != "xno"; then
 fi
 AM_CONDITIONAL(HAVE_GLIB, $have_glib)
 
+AC_ARG_ENABLE(quiet-build, [  --enable-quiet-build  Enable quiet runtime build (on by default)], enable_quiet_build=$enableval, enable_quiet_build=yes)
 AC_SUBST(GPOINTER_TO_INT)
 AC_SUBST(GPOINTER_TO_UINT)
 AC_SUBST(GINT_TO_POINTER)
@@ -169,6 +188,11 @@ AC_SUBST(GSIZE_FORMAT)
 AC_SUBST(G_GUINT64_FORMAT)
 AC_SUBST(G_GINT64_FORMAT)
 
+if test x$enable_quiet_build = xyes; then
+   AC_CONFIG_COMMANDS([quiet], [for i in `find src test -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do if test -f $i; then $srcdir/../scripts/patch-quiet.sh $i; fi; done], [shell=$SHELL])
+   AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
+fi
+
 AC_OUTPUT([
 Makefile
 src/Makefile