2003-07-16  Ralf Corsepius <address@hidden>

	* m4/multi.m4 (AM_ENABLE_MULTILIB): Add 3rd argument to enable
	switching the default.

Index: m4/multi.m4
===================================================================
RCS file: /cvs/automake/automake/m4/multi.m4,v
retrieving revision 1.10
diff -u -r1.10 multi.m4
--- m4/multi.m4	26 Dec 2001 17:38:30 -0000	1.10
+++ m4/multi.m4	15 Jul 2003 07:24:48 -0000
@@ -1,4 +1,4 @@
-# Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,21 +15,21 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 3
+# serial 4
 
-# AM_ENABLE_MULTILIB([MAKEFILE], [REL-TO-TOP-SRCDIR])
+# AM_ENABLE_MULTILIB([MAKEFILE], [REL-TO-TOP-SRCDIR], [DEFAULT])
 # ---------------------------------------------------
 # Add --enable-multilib to configure.
 AC_DEFUN([AM_ENABLE_MULTILIB],
 [# Default to --enable-multilib
 AC_ARG_ENABLE(multilib,
-[  --enable-multilib         build many library versions (default)],
+[  --enable-multilib       build many library versions (default:]m4_default([$3],yes)[)],
 [case "$enableval" in
   yes) multilib=yes ;;
   no)  multilib=no ;;
   *)   AC_MSG_ERROR([bad value $enableval for multilib option]) ;;
  esac],
-              [multilib=yes])
+              [multilib=m4_default([$3],yes)])
 
 # We may get other options which we leave undocumented:
 # --with-target-subdir, --with-multisrctop, --with-multisubdir