--- general_old.m4	2002-11-26 20:48:32.000000000 +0000
+++ general.m4	2005-12-27 12:13:08.000000000 +0000
@@ -1584,6 +1584,37 @@
 ])# AC_CONFIG_AUX_DIRS
 
 
+# AC_CONFIG_AUX_GUESS(DIR ...)
+# ---------------------------
+# Internal subroutine.
+# Search for config.guess and config.sub in directory list $1.
+AC_DEFUN([AC_CONFIG_AUX_GUESS],
+[ac_aux_guess_dir=
+for ac_guess_dir in $1; do
+  if test -f $ac_guess_dir/config.guess; then
+    if test -f $ac_guess_dir/config.sub; then
+      ac_aux_guess_dir=$ac_guess_dir
+      ac_config_guess="$SHELL $ac_aux_guess_dir/config.guess"
+      ac_config_sub="$SHELL $ac_aux_guess_dir/config.sub"
+      break;
+    fi
+  fi
+done
+if test -z "$ac_aux_guess_dir"; then
+  AC_MSG_ERROR([cannot find config.guess or config.sub in $1])
+fi
+AC_PROVIDE([AC_CONFIG_AUX_GUESS])dnl
+])# AC_CONFIG_AUX_GUESS
+
+
+# AC_CONFIG_AUX_GUESS_DEFAULT
+# -------------------------
+# The default is `$srcdir' or `$srcdir/..' or `$srcdir/../..'.
+# There's no need to call this macro explicitly; just AC_REQUIRE it.
+AC_DEFUN([AC_CONFIG_AUX_GUESS_DEFAULT],
+[AC_CONFIG_AUX_GUESS($srcdir $srcdir/.. $srcdir/../..)])
+
+
 
 
 ## ----------------------------------- ##
@@ -1617,7 +1648,7 @@
 # AC_CANONICAL_BUILD
 # ------------------
 AC_DEFUN_ONCE([AC_CANONICAL_BUILD],
-[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+[AC_REQUIRE([AC_CONFIG_AUX_GUESS_DEFAULT])dnl
 m4_divert_text([HELP_CANON],
 [[
 System types: