2006-10-10 Zoltan Varga <vargaz@gmail.com>

	* configure.in: Get rid of --with-nptl.

svn path=/trunk/mono/; revision=66494

diff --git a/ChangeLog b/ChangeLog
index 23d2512af50d412013afa4cb5045892b522a7aa1..ed2588baf520ffc95906010f21b004b354f70743 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-10-10  Zoltan Varga  <vargaz@gmail.com>
+
+       * configure.in: Get rid of --with-nptl.
 
 Sat Sep 30 12:11:56 CEST 2006 Paolo Molaro <lupus@ximian.com>
 

diff --git a/configure.in b/configure.in
index 5ff1fc49f08e7a98d7a029bcbeeeea8b92468128..73ac1f6c949326b3564e53fb8252317dad07b822 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -72,7 +72,6 @@ case "$host" in
                libdl=
                libgc_threads=win32
                gc_default=included
-               with_nptl=default
                with_sigaltstack=no
                LN_S=cp
                # This forces libgc to use the DllMain based thread registration code on win32
@@ -113,7 +112,6 @@ case "$host" in
                libdl=
                libgc_threads=pthreads
 # TLS isn't implemented at all on 4-STABLE
-               with_nptl=no
                with_tls=pthread
                ;;
        *-*-*freebsd5*)
@@ -206,7 +204,7 @@ case "$host" in
                libmono_cflags="-D_REENTRANT"
                libgc_threads=pthreads
                # This doesn't seem to work on solaris/x86, but the configure test runs
-               with_nptl=no
+               with_tls=pthread
                ;;
        *-*-darwin*)
                platform_win32=no
@@ -470,20 +468,6 @@ AC_ARG_WITH(gc, [  --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default]
 # Some systems have broken support, so we allow to disable it.
 AC_ARG_WITH(tls, [  --with-tls=__thread,pthread       select Thread Local Storage implementation],[],[with_tls=__thread])
 
-# Kept for compatibility
-AC_ARG_WITH(nptl, [  --with-nptl=yes,no      deprecated, use --with-tls instead],[],[with_nptl=default])
-
-if test "x$with_nptl" != "xdefault"; then
-   if test "x$with_nptl" = "xyes"; then
-      AC_MSG_WARN([--with-nptl=yes is deprecated, use --with-tls=__thread option instead.])
-         with_tls=__thread
-   fi
-   if test "x$with_nptl" = "xno"; then
-      AC_MSG_WARN([--with-nptl=no is deprecated, use --with-tls=pthread option instead.])
-         with_tls=pthread
-   fi
-fi
-
 # Enable support for using sigaltstack for SIGSEGV and stack overflow handling
 # This does not work on some platforms (bug #55253)
 AC_ARG_WITH(sigaltstack, [  --with-sigaltstack=yes,no      enable/disable support for sigaltstack],[],[with_sigaltstack=no])