Hey, right now bootstrap will always run autpoint, even if one might not be using it. Since autopoint requires that AM_GNU_GETTEXT_VERSION, we can easily check if we are using autopoint/gettext.
2007-03-16 Alfred M. Szmidt <[EMAIL PROTECTED]> * build-aux/bootstrap (with_gettext): New variable. Only run autopoint and copy gettext configuration files if WITH_GETTEXT is t. --- bootstrap 15 Mar 2007 23:58:36 +0100 1.1 +++ bootstrap 16 Mar 2007 19:54:12 +0100 @@ -466,13 +467,18 @@ done # Import from gettext. - -echo "$0: (cd $bt2; autopoint) ..." -cp configure.ac $bt2 && -(cd $bt2 && autopoint && rm configure.ac) && -slurp $bt2 $bt || exit - -rm -fr $bt $bt2 || exit +with_gettext=t +grep '^[ ]*AM_GNU_GETTEXT_VERSION\>' configure.ac >/dev/null || \ + with_gettext=nil + +if test "$with_gettext" = t; then + echo "$0: (cd $bt2; autopoint) ..." + cp configure.ac $bt2 && + (cd $bt2 && autopoint && rm configure.ac) && + slurp $bt2 $bt || exit + + rm -fr $bt $bt2 || exit +fi # Reconfigure, getting other files. @@ -504,11 +510,11 @@ for file in $gnulib_extra_files; do symlink_to_gnulib $file $dst || exit done - -# Create gettext configuration. -echo "$0: Creating po/Makevars from po/Makevars.template ..." -rm -f po/Makevars -sed ' +if test "$with_gettext" = t; then + # Create gettext configuration. + echo "$0: Creating po/Makevars from po/Makevars.template ..." + rm -f po/Makevars + sed ' /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/ /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ /^XGETTEXT_OPTIONS *=/{ @@ -517,11 +523,11 @@ sed ' '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} } ' po/Makevars.template >po/Makevars - -if test -d runtime-po; then - # Similarly for runtime-po/Makevars, but not quite the same. - rm -f runtime-po/Makevars - sed ' + + if test -d runtime-po; then + # Similarly for runtime-po/Makevars, but not quite the same. + rm -f runtime-po/Makevars + sed ' /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/ /^subdir *=.*/s/=.*/= runtime-po/ /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ @@ -531,9 +537,10 @@ if test -d runtime-po; then '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} } ' <po/Makevars.template >runtime-po/Makevars - - # Copy identical files from po to runtime-po. - (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) + + # Copy identical files from po to runtime-po. + (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) + fi fi echo "$0: done. Now you can run './configure'."