diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2004-05-19 07:42:02 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2004-05-19 07:42:02 +0400 |
| commit | ceffb58197d4f735f33bcefc8712683b60aaed78 (patch) | |
| tree | 9f0254a615efe035df9d7db96ea405b3032c852b /configure.in | |
| parent | 6aa078964ee81cb8d4fc4539e32e16b1cee476a4 (diff) | |
* configure.in: Use proper autoconf idiom to pass additional
arguments to libgc/configure.
(PLATFORM_WIN32, NEED_LINK_UNLINK): Use three-argument AC_DEFINE.
* acconfig.h: Update to reflect changes.
svn path=/trunk/mono/; revision=27644
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/configure.in b/configure.in index d0c5afa7a1d..818589ab257 100644 --- a/configure.in +++ b/configure.in @@ -30,13 +30,16 @@ AC_SUBST(libmono_ldflags) dnl if linker handles the version script no_version_script=no +# Set to yes if Unix sockets cannot be created in an anonymous namespace +need_link_unlink=no + # Thread configuration inspired by sleepycat's db AC_MSG_CHECKING([host platform characteristics]) libgc_threads=no case "$host" in *-*-mingw*|*-*-cygwin*) platform_win32=yes - AC_DEFINE(PLATFORM_WIN32) + AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32]) CC="gcc -mno-cygwin" HOST_CC="gcc" # latest libgc already defines GC_WIN32_THREADS @@ -52,7 +55,7 @@ case "$host" in libmono_cflags="-D_REENTRANT" LDFLAGS="$LDFLAGS -pthread" libmono_ldflags="-pthread" - AC_DEFINE(NEED_LINK_UNLINK) + need_link_unlink=yes libdl= libgc_threads=no ;; @@ -62,7 +65,7 @@ case "$host" in libmono_cflags="-D_THREAD_SAFE" LDFLAGS="$LDFLAGS -pthread" libmono_ldflags="-pthread" - AC_DEFINE(NEED_LINK_UNLINK) + need_link_unlink=yes AC_DEFINE(PTHREAD_POINTER_ID) libdl= libgc_threads=pthreads @@ -83,12 +86,12 @@ case "$host" in libmono_cflags="-D_REENTRANT" libmono_ldflags="-lpthread" libgc_threads=pthreads - AC_DEFINE(NEED_LINK_UNLINK) + need_link_unlink=yes ;; *-*-solaris*) platform_win32=no CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT" - AC_DEFINE(NEED_LINK_UNLINK) + need_link_unlink=yes libmono_cflags="-D_REENTRANT" libgc_threads=pthreads ;; @@ -98,7 +101,7 @@ case "$host" in libmono_cflags="-D_THREAD_SAFE" LDFLAGS="$LDFLAGS -pthread" libmono_ldflags="-pthread" - AC_DEFINE(NEED_LINK_UNLINK) + need_link_unlink=yes AC_DEFINE(PTHREAD_POINTER_ID) AC_DEFINE(USE_MACH_SEMA) no_version_script=yes @@ -113,6 +116,11 @@ case "$host" in ;; esac AC_MSG_RESULT(ok) + +if test x$need_link_unlink = xyes; then + AC_DEFINE(NEED_LINK_UNLINK, 1, [Define if Unix sockets cannot be created in an anonymous namespace]) +fi + AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes) AC_CHECK_TOOL(CC, gcc, gcc) @@ -308,9 +316,9 @@ case "x$gc" in ;; esac -we_are_embedded_in_mono=yes -export we_are_embedded_in_mono -export libgc_threads + +# tell libgc/configure about what we want +ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads" AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes) AC_SUBST(LIBGC_CFLAGS) |