summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xautomake.in4
-rwxr-xr-xconfigure9
3 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d0c0ceca0..bfb3d828d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-11 Alexandre Duret-Lutz <adl@gnu.org>
+
+ Temporary hack for PR automake/381:
+ * automake.in (handle_gettext): Turn missing po/ and intl/ errors
+ into -Wsyntax warnings.
+
2003-02-10 Richard Dawe <rich@phekda.freeserve.co.uk>
* Makefile.am: Substitute @SHELL@ in automake.in and aclocal.in.
diff --git a/automake.in b/automake.in
index 4289e262b..0d9c30e4b 100755
--- a/automake.in
+++ b/automake.in
@@ -4724,11 +4724,11 @@ sub handle_gettext
}
my @subdirs = &variable_value_as_list_recursive ('SUBDIRS', 'all');
- err_var 'SUBDIRS', "AM_GNU_GETTEXT used but `po' not in SUBDIRS"
+ msg_var 'syntax', 'SUBDIRS', "AM_GNU_GETTEXT used but `po' not in SUBDIRS"
if ! grep ($_ eq 'po', @subdirs);
# intl/ is not required when AM_GNU_GETTEXT is called with
# the `external' option.
- err_var 'SUBDIRS', "AM_GNU_GETTEXT used but `intl' not in SUBDIRS"
+ msg_var 'syntax', 'SUBDIRS', "AM_GNU_GETTEXT used but `intl' not in SUBDIRS"
if (! $seen_gettext_external
&& ! grep ($_ eq 'intl', @subdirs));
diff --git a/configure b/configure
index 63bccbafc..72cc8a09a 100755
--- a/configure
+++ b/configure
@@ -1463,6 +1463,15 @@ else
fi
rmdir .tst 2>/dev/null
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
# test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then