gnulib-tool: gnulib - gettext mismatch

[Bruno Haible]

"gnulib-tool --create-testdir --dir=/tmp/testdir" is currently broken.
"autopoint" installs .m4 files that override the ones installed by gnulib-tool,
in particular inttypes-pri.m4 then doesn't AC_SUBST(PRI_MACROS_BROKEN) any
more, therefore the generated inttypes.h has incorrect C syntax. This
fixes it (but only for --create-testdir, not for --import).


2006-10-11  Bruno Haible  <address@hidden>

        * gnulib-tool (GETTEXTPATH, AUTOHEADER, AUTOPOINT): New variables.
        (func_create_testdir): Don't create po/Makefile.am, don't invoke
        autoreconf. Instead, invoke autopoint explicitly but move back the
        *.m4 files from gnulib.

*** gnulib-tool.bak     2006-10-12 03:53:38.000000000 +0200
--- gnulib-tool 2006-10-12 03:40:12.000000000 +0200
***************
*** 40,50 ****
  # You can set AUTOMAKEPATH to empty if automake 1.9.x is already in your PATH.
  AUTOMAKEPATH=
  
  # If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the
! # variables AUTOCONF, ACLOCAL, AUTOMAKE, AUTORECONF individually.
  if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then
    AUTOCONF="${AUTOCONFPATH}autoconf"
  fi
  if test -z "${ACLOCAL}" || test -n "${AUTOMAKEPATH}"; then
    ACLOCAL="${AUTOMAKEPATH}aclocal"
  fi
--- 40,56 ----
  # You can set AUTOMAKEPATH to empty if automake 1.9.x is already in your PATH.
  AUTOMAKEPATH=
  
+ # You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH.
+ GETTEXTPATH=
+ 
  # If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the
! # variables AUTOCONF, AUTOHEADER, ACLOCAL, AUTOMAKE, AUTORECONF individually.
  if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then
    AUTOCONF="${AUTOCONFPATH}autoconf"
  fi
+ if test -z "${AUTOHEADER}" || test -n "${AUTOCONFPATH}"; then
+   AUTOHEADER="${AUTOCONFPATH}autoheader"
+ fi
  if test -z "${ACLOCAL}" || test -n "${AUTOMAKEPATH}"; then
    ACLOCAL="${AUTOMAKEPATH}aclocal"
  fi
***************
*** 55,60 ****
--- 61,71 ----
    AUTORECONF="${AUTOCONFPATH}autoreconf"
  fi
  
+ # If you didn't set GETTEXTPATH, you can also set the variable AUTOPOINT.
+ if test -z "${AUTOPOINT}" || test -n "${GETTEXTPATH}"; then
+   AUTOPOINT="${GETTEXTPATH}autopoint"
+ fi
+ 
  # GNU sort is needed. Set SORT to its location (not needed if it's called
  # 'sort' and already in the PATH).
  if test -z "$SORT"; then
***************
*** 2145,2151 ****
    subdirs="$sourcebase $m4base"
    subdirs_with_configure_ac=""
  
!   if test -f "$testdir"/$m4base/gettext.m4; then
      # Avoid stupid error message from automake:
      # "AM_GNU_GETTEXT used but `po' not in SUBDIRS"
      mkdir -p "$testdir/po"
--- 2189,2195 ----
    subdirs="$sourcebase $m4base"
    subdirs_with_configure_ac=""
  
!   if false && test -f "$testdir"/$m4base/gettext.m4; then
      # Avoid stupid error message from automake:
      # "AM_GNU_GETTEXT used but `po' not in SUBDIRS"
      mkdir -p "$testdir/po"
***************
*** 2357,2364 ****
  
    # Create autogenerated files.
    (cd "$testdir"
!    echo "executing ${AUTORECONF} --force --install"
!    ${AUTORECONF} --force --install
    )
    if grep '^BUILT_SOURCES *+=' "$testdir/$sourcebase/Makefile.am" > 
/dev/null; then
      (cd "$testdir"
--- 2459,2485 ----
  
    # Create autogenerated files.
    (cd "$testdir"
!    # Do not use "${AUTORECONF} --force --install", because it may invoke
!    # autopoint, which brings in older versions of some of our .m4 files.
!    if test -f $m4base/gettext.m4; then
!      echo "executing ${AUTOPOINT} --force"
!      ${AUTOPOINT} --force
!      for f in $m4base/*.m4~; do
!        mv $f `echo $f | sed -e 's,~$,,'`
!      done
!    fi
!    echo "executing ${ACLOCAL} --force -I $m4base"
!    ${ACLOCAL} --force -I $m4base
!    if ! test -d build-aux; then
!      echo "executing mkdir build-aux"
!      mkdir build-aux
!    fi
!    echo "executing ${AUTOCONF} --force"
!    ${AUTOCONF} --force
!    echo "executing ${AUTOHEADER} --force"
!    ${AUTOHEADER} --force
!    echo "executing ${AUTOMAKE} --add-missing --copy --force-missing"
!    ${AUTOMAKE} --add-missing --copy --force-missing
    )
    if grep '^BUILT_SOURCES *+=' "$testdir/$sourcebase/Makefile.am" > 
/dev/null; then
      (cd "$testdir"