bug-gnulib
[Top][All Lists]
Advanced

[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: Jim Meyering
Subject: Re: [PATCH] autopoint always run even though it might not be used
Date: Fri, 16 Mar 2007 22:03:21 +0100

"Alfred M. Szmidt" <address@hidden> wrote:
...
>    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.

Thanks.
Here's what I've just checked in, which includes these small changes:
- use "yes" and "no"
- remove unnecessary quotes around $with_gettext
- indent consistently

2007-03-16  Alfred M. Szmidt  <address@hidden>

        * build-aux/bootstrap (with_gettext): New variable.  Run autopoint
        and copy gettext configuration files only if configure.ac contains
        a use of AM_GNU_GETTEXT_VERSION.

Index: build-aux/bootstrap
===================================================================
RCS file: /cvsroot/gnulib/gnulib/build-aux/bootstrap,v
retrieving revision 1.2
diff -u -p -r1.2 bootstrap
--- build-aux/bootstrap 16 Mar 2007 20:22:58 -0000      1.2
+++ build-aux/bootstrap 16 Mar 2007 21:00:45 -0000
@@ -467,13 +467,18 @@ done


 # Import from gettext.
+with_gettext=yes
+grep '^[        ]*AM_GNU_GETTEXT_VERSION\>' configure.ac >/dev/null || \
+    with_gettext=no
+
+if test $with_gettext = yes; then
+  echo "$0: (cd $bt2; autopoint) ..."
+  cp configure.ac $bt2 &&
+  (cd $bt2 && autopoint && rm configure.ac) &&
+  slurp $bt2 $bt || exit

-echo "$0: (cd $bt2; autopoint) ..."
-cp configure.ac $bt2 &&
-(cd $bt2 && autopoint && rm configure.ac) &&
-slurp $bt2 $bt || exit
-
-rm -fr $bt $bt2 || exit
+  rm -fr $bt $bt2 || exit
+fi


 # Reconfigure, getting other files.
@@ -505,36 +510,37 @@ 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 '
-  /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
-  /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
-  /^XGETTEXT_OPTIONS *=/{
-    s/$/ \\/
-    a\
-       '"$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
+if test $with_gettext = yes; then
+  # Create gettext configuration.
+  echo "$0: Creating po/Makevars from po/Makevars.template ..."
+  rm -f po/Makevars
   sed '
-    /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
-    /^subdir *=.*/s/=.*/= runtime-po/
+    /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
     /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
     /^XGETTEXT_OPTIONS *=/{
       s/$/ \\/
       a\
-         '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+         '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
     }
-  ' <po/Makevars.template >runtime-po/Makevars
+  ' po/Makevars.template >po/Makevars

-  # Copy identical files from po to runtime-po.
-  (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
+  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/
+      /^XGETTEXT_OPTIONS *=/{
+       s/$/ \\/
+       a\
+           '"$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)
+  fi
 fi

 echo "$0: done.  Now you can run './configure'."




reply via email to

[Prev in Thread] Current Thread [Next in Thread]