Hello,
I commited the patch attached.
It removes the broken check from AC_CONFIG_LIBOBJ_DIR.
Moreover, it contains one small unrelated change: improved sanity
check in m4_bmatch; this was also part of the patch which started
this thread.
Have a nice day,
Stepan
2005-05-13 Stepan Kasal <[EMAIL PROTECTED]>
* lib/autoconf/general.m4 (AC_CONFIG_LIBOBJ_DIR): Remove the broken
check.
* lib/m4sugar/m4sugar.m4 (m4_bmatch): Halt with error if we don't get
enough arguments, similarly as in m4_bpatsubsts.
Index: lib/autoconf/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v
retrieving revision 1.853
diff -u -r1.853 general.m4
--- lib/autoconf/general.m4 12 May 2005 11:26:07 -0000 1.853
+++ lib/autoconf/general.m4 13 May 2005 09:15:51 -0000
@@ -2492,10 +2492,7 @@
# -----------------------------
# Announce LIBOBJ replacement files are in $top_srcdir/DIRNAME.
AC_DEFUN_ONCE([AC_CONFIG_LIBOBJ_DIR],
-[m4_bmatch([$1], [^]m4_defn([m4_cr_symbols2]),
- [AC_WARNING([invalid replacement directory: $1])])dnl
-m4_divert_text([DEFAULTS], [ac_config_libobj_dir=$1])[]dnl
-])
+[m4_divert_text([DEFAULTS], [ac_config_libobj_dir=$1])])
# AC_LIBSOURCE(FILE-NAME)
Index: lib/m4sugar/m4sugar.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/m4sugar/m4sugar.m4,v
retrieving revision 2.85
diff -u -r2.85 m4sugar.m4
--- lib/m4sugar/m4sugar.m4 22 Apr 2005 06:37:26 -0000 2.85
+++ lib/m4sugar/m4sugar.m4 13 May 2005 09:15:51 -0000
@@ -374,8 +374,8 @@
# All the values are optional, and the macro is robust to active symbols
# properly quoted.
m4_define([m4_bmatch],
-[m4_if([$#], 0, [],
- [$#], 1, [],
+[m4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])],
+ [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])],
[$#], 2, [$2],
[m4_if(m4_bregexp([$1], [$2]), -1, [$0([$1], m4_shiftn(3, $@))],
[$3])])])
