-------------------------------------------------------------------
Wed Jun  4 14:29:07 CEST 2003 - kukuk@suse.de

- Make --no-archive default for localedef

--- glibc-2.5.orig/locale/programs/localedef.c
+++ glibc-2.5/locale/programs/localedef.c
@@ -81,7 +81,7 @@ const char *alias_file;
 static struct localedef_t *locales;
 
 /* If true don't add locale data to archive.  */
-bool no_archive;
+bool no_archive = true;
 
 /* If true add named locales to archive.  */
 static bool add_to_archive;
@@ -112,6 +112,7 @@ #define OPT_ADD_TO_ARCHIVE 306
 #define OPT_REPLACE 307
 #define OPT_DELETE_FROM_ARCHIVE 308
 #define OPT_LIST_ARCHIVE 309
+#define OPT_ARCHIVE 310
 
 /* Definitions of arguments for argp functions.  */
 static const struct argp_option options[] =
@@ -133,6 +134,8 @@ static const struct argp_option options[
     N_("Suppress warnings and information messages") },
   { "verbose", 'v', NULL, 0, N_("Print more messages") },
   { NULL, 0, NULL, 0, N_("Archive control:") },
+  { "archive", OPT_ARCHIVE, NULL, 0,
+    N_("Add new data to archive") },
   { "no-archive", OPT_NO_ARCHIVE, NULL, 0,
     N_("Don't add new data to archive") },
   { "add-to-archive", OPT_ADD_TO_ARCHIVE, NULL, 0,
@@ -313,6 +316,9 @@ parse_opt (int key, char *arg, struct ar
     case OPT_PREFIX:
       output_prefix = arg;
       break;
+    case OPT_ARCHIVE:
+      no_archive = false;
+      break;
     case OPT_NO_ARCHIVE:
       no_archive = true;
       break;