X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Ferror;h=c78e7fe409a7884ca78c93d90d58108031ac5fb1;hb=8b40415718be86c3a37388ba35804be74b8f376e;hp=cdf57f07d5aca767e541df91bbff9f3ebbe94f95;hpb=d5d3e86d326de4aa7d661fde1ebb636f3efbffd5;p=gnulib.git

diff --git a/modules/error b/modules/error
index cdf57f07d..c78e7fe40 100644
--- a/modules/error
+++ b/modules/error
@@ -1,5 +1,10 @@
 Description:
-error() and error_at_line() functions: Error reporting.
+error and error_at_line functions: Error reporting.
+
+Notice:
+If you are using GNU gettext version 0.16.1 or older, add the following options
+to XGETTEXT_OPTIONS in your po/Makevars:
+  --flag=error:3:c-format --flag=error_at_line:5:c-format
 
 Files:
 lib/error.h
@@ -7,10 +12,20 @@ lib/error.c
 m4/error.m4
 
 Depends-on:
-strerror
+stdio           [test $ac_cv_lib_error_at_line = no]
+strerror        [test $ac_cv_lib_error_at_line = no]
+unistd          [test $ac_cv_lib_error_at_line = no]
+msvc-nothrow    [test $ac_cv_lib_error_at_line = no]
 
 configure.ac:
 gl_ERROR
+if test $ac_cv_lib_error_at_line = no; then
+  AC_LIBOBJ([error])
+  gl_PREREQ_ERROR
+fi
+m4_ifdef([AM_XGETTEXT_OPTION],
+  [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
+   AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
 
 Makefile.am: