[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] autopoint always run even though it might not be used
From: |
Alfred M. Szmidt |
Subject: |
Re: [PATCH] autopoint always run even though it might not be used |
Date: |
Fri, 16 Mar 2007 21:37:49 +0100 (CET) |
> +with_gettext=t
> +grep '^[ ]*AM_GNU_GETTEXT_VERSION\>' configure.ac >/dev/null || \
> + with_gettext=nil
Please use "yes" and "no" for such values, or ":"/"true" and "false"
if you intend to use them as commands (as in `if $with_gettext'). "t"
is impossible to understand for those that don't speak the language this
idiom originated in.
Sorry, been coding Lisp latley. Here is a updated (though untested
version) of the patch.
2007-03-16 Alfred M. Szmidt <address@hidden>
* build-aux/bootstrap (with_gettext): New variable. Only run
autopoint and copy gettext configuration files if WITH_GETTEXT is
`true'.
--- 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=true
+grep '^[ ]*AM_GNU_GETTEXT_VERSION\>' configure.ac >/dev/null || \
+ with_gettext=false
+
+if test "$with_gettext" = true; 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" = true; 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'."