X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=eglib%2Fconfigure.ac;h=d18915003e20fb9eace435794e99470103be7dd1;hb=35044c74a25b2c3c983ceca94f5163fa309a495c;hp=17fb429f2f1a8a225cd7555a6c75ca885b1eb615;hpb=93cf36c2cece0c15f3eadf85765817a52749cf0d;p=mono.git diff --git a/eglib/configure.ac b/eglib/configure.ac index 17fb429f2f1..d18915003e2 100644 --- 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,22 +34,41 @@ 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" + PIDTYPE='void *' + ;; +*-*darwin*) + platform_darwin=yes + PATHSEP='/' + SEARCHSEP=':' + OS="UNIX" + PIDTYPE='int' ;; *) PATHSEP='/' SEARCHSEP=':' OS="UNIX" + PIDTYPE='int' ;; esac +case $host in + *-*-solaris*) + CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS" + ;; +esac + case $target in arm*-darwin*) CFLAGS="$CFLAGS -U_FORTIFY_SOURCE" @@ -67,15 +87,23 @@ AC_SUBST(CFLAGS) AC_SUBST(PATHSEP) AC_SUBST(SEARCHSEP) AC_SUBST(OS) +AC_SUBST(PIDTYPE) 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 *) +AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(long long) 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 @@ -104,9 +132,20 @@ 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 sys/types.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 +if test $ac_cv_sizeof_void_p = $ac_cv_sizeof_int; then + GPOINTER_TO_INT="((gint) (ptr))" + GPOINTER_TO_UINT="((guint) (ptr))" + GINT_TO_POINTER="((gpointer) (v))" + GUINT_TO_POINTER="((gpointer) (v))" + GSIZE="int" + GSIZE_FORMAT='"u"' + G_GUINT64_FORMAT='"llu"' + G_GINT64_FORMAT='"lld"' +elif test $ac_cv_sizeof_void_p = $ac_cv_sizeof_long; then GPOINTER_TO_INT="((gint)(long) (ptr))" GPOINTER_TO_UINT="((guint)(long) (ptr))" GINT_TO_POINTER="((gpointer)(glong) (v))" @@ -115,21 +154,20 @@ if test $ac_cv_sizeof_void_p != $ac_cv_sizeof_int; then GSIZE_FORMAT='"lu"' G_GUINT64_FORMAT='"lu"' G_GINT64_FORMAT='"ld"' +elif test $ac_cv_sizeof_void_p = $ac_cv_sizeof_long_long; then + GPOINTER_TO_INT="((gint)(long long) (ptr))" + GPOINTER_TO_UINT="((guint)(unsigned long long) (ptr))" + GINT_TO_POINTER="((gpointer)(long long) (v))" + GUINT_TO_POINTER="((gpointer)(unsigned long long) (v))" + GSIZE="long long" + GSIZE_FORMAT='"I64u"' + G_GUINT64_FORMAT='"I64u"' + G_GINT64_FORMAT='"I64i"' else - GPOINTER_TO_INT="((gint) (ptr))" - GPOINTER_TO_UINT="((guint) (ptr))" - GINT_TO_POINTER="((gpointer) (v))" - GUINT_TO_POINTER="((gpointer) (v))" - GSIZE="int" - GSIZE_FORMAT='"u"' - G_GUINT64_FORMAT='"llu"' - G_GINT64_FORMAT='"lld"' + AC_MSG_ERROR([unsupported pointer size]) 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], @@ -147,13 +185,17 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Chan 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; +have_glib=false +if test "x$PKG_CONFIG" != "xno"; then + if $PKG_CONFIG --atleast-version=$GLIB_REQUIRED_VERSION glib-2.0; then + have_glib=true; + else + have_glib=false; + fi 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) @@ -163,6 +205,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