Re: fix gl_LOCK constraints

[Bruno Haible]

Eric Blake wrote:
> Unfortunately, this is now giving me the following when bootstrapping m4:
> 
> during gnulib-tool update:
> Updating file ltdl/m4/lock.m4 (backup in ltdl/m4/lock.m4~)
> 
> during autoreconf -fv
> autoreconf: running: autopoint --force
> ...
> Copying file ltdl/m4/lock.m4
> 
> ...
> 
> configure.ac:104: warning: gl_LOCK_EARLY is m4_require'd but not m4_defun'd

Yes, it appears that the gettext / gnulib conflict is hitting you :-(

> What is the recommended approach to use gnulib's lock.m4 instead of
> gettext 0.15's?

Running autopoint _before_ gnulib-tool, so that gnulib-tool's newer
files will overwrite those from gettext, appears to work better.

Bruno


*** bootstrap.bak       11 Aug 2006 15:42:58 -0000      1.37
--- bootstrap   25 Aug 2006 16:21:58 -0000
***************
*** 43,48 ****
--- 43,49 ----
  
  # Report bugs to <address@hidden>
  
+ : ${AUTOPOINT=autopoint}
  : ${AUTORECONF=autoreconf}
  : ${AWK=awk}
  : ${GNULIB_TOOL=gnulib-tool}
***************
*** 309,314 ****
--- 310,322 ----
    *)    func_update_po $DOWNLOAD_PO ;;
  esac
  
+ ## ---------- ##
+ ## Autopoint. ##
+ ## ---------- ##
+ 
+ func_echo "running: $AUTOPOINT --force"
+ $AUTOPOINT --force
+ 
  ## ---------------------------- ##
  ## Find the gnulib module tree. ##
  ## ---------------------------- ##
***************
*** 385,390 ****
--- 393,400 ----
  ## ----------- ##
  
  func_echo "running: $AUTORECONF --force --verbose --install --no-recursive"
+ # Disable autopoint, since it was already done above.
+ AUTOPOINT=true \
  $AUTORECONF --force --verbose --install --no-recursive