acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Enable gnu locale model on linux by default.

2001-12-15  Benjamin Kosnik  <bkoz@redhat.com>

	* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Enable gnu locale model
	on linux by default.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

From-SVN: r48046

libstdc++-v3/ChangeLog

+2001-12-15  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Enable gnu locale model
+	on linux by default.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+	
 2001-12-14  Benjamin Kosnik  <bkoz@redhat.com>
 
 	Clean up initialization and simplfy caching of underlying "C"
-	locale objects.
+	default locale objects.
 	* src/localename.cc (locale::_Impl::_Impl(string, size_t):
 	Unconditionally create __clocale object for all named locales,
 	including "C" and "POSIX".

libstdc++-v3/acinclude.m4

@@ -1041,13 +1041,31 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
   --enable-clocale=MODEL  use MODEL target-speific locale package. [default=generic]
   ], 
   if test x$enable_clocale = xno; then
-     enable_clocale=generic
+     enable_clocale=no
   fi,
-     enable_clocale=generic)
+     enable_clocale=no)
 
   enable_clocale_flag=$enable_clocale
 
-  dnl Check if a valid locale package
+  dnl Probe for locale support if no specific model is specified.
+  dnl Default to "generic"
+  if test x$enable_clocale_flag = xno; then
+    case x${target_os} in
+      xlinux* | xgnu*)
+	AC_EGREP_CPP([ok], [
+        #include <features.h>
+        #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) 
+          ok
+        #endif
+        ], enable_clocale_flag=gnu, enable_clocale_flag=generic)
+        ;;
+      *)
+	enable_clocale_flag=generic
+	;;
+    esac
+  fi
+
+  dnl Set configure bits for specified locale package
   case x${enable_clocale_flag} in
     xgeneric)
       AC_MSG_RESULT(generic)

libstdc++-v3/aclocal.m4

@@ -1053,13 +1053,31 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
   --enable-clocale=MODEL  use MODEL target-speific locale package. [default=generic]
   ], 
   if test x$enable_clocale = xno; then
-     enable_clocale=generic
+     enable_clocale=no
   fi,
-     enable_clocale=generic)
+     enable_clocale=no)
 
   enable_clocale_flag=$enable_clocale
 
-  dnl Check if a valid locale package
+  dnl Probe for locale support if no specific model is specified.
+  dnl Default to "generic"
+  if test x$enable_clocale_flag = xno; then
+    case x${target_os} in
+      xlinux* | xgnu*)
+	AC_EGREP_CPP([ok], [
+        #include <features.h>
+        #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) 
+          ok
+        #endif
+        ], enable_clocale_flag=gnu, enable_clocale_flag=generic)
+        ;;
+      *)
+	enable_clocale_flag=generic
+	;;
+    esac
+  fi
+
+  dnl Set configure bits for specified locale package
   case x${enable_clocale_flag} in
     xgeneric)
       AC_MSG_RESULT(generic)