>>>>> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes:
| What about this patch? I am not sure it cures the original problem,
| but it looks like a welcome cleanup.
Lars> I am in favour.
OK, I propose to apply the following one, where I get rid of the
ALL_LINGUAS variable and replace it with a po/LINGUAS, as gettext
recommends currently. It makes more sense anyway.
OK?
JMarc
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.1005
diff -u -p -r1.1005 ChangeLog
--- ChangeLog 7 Mar 2005 12:28:32 -0000 1.1005
+++ ChangeLog 11 Mar 2005 10:13:38 -0000
@@ -1,3 +1,10 @@
+2005-03-11 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * configure.ac: remove hack when GNU gettext utilities are not
+ available; remove calls to AC_C_CONST and AC_C_INLINE (already
+ required by AM_INTL_SUBDIR; remove ALL_LINGUAS variable (see
+ po/LINGUAS instead); do not AC_SUBST LINGUAS.
+
2005-03-07 Georg Baum <[EMAIL PROTECTED]>
* autogen.sh: remove autom4te.cache directories
Index: configure.ac
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v
retrieving revision 1.46
diff -u -p -r1.46 configure.ac
--- configure.ac 6 Mar 2005 04:29:27 -0000 1.46
+++ configure.ac 11 Mar 2005 10:13:38 -0000
@@ -22,10 +22,6 @@ LYX_VERSION_SUFFIX
AM_INIT_AUTOMAKE($lyxname, $VERSION)
-# The list of languages known to LyX
-# This is needed by GNU gettext
-ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl nn no pl pt ro ru sk sl sv tr wa"
-
### Set the execute permissions of the various scripts correctly
for file in config/install-sh config/mkinstalldirs lib/configure ; do
chmod 755 ${srcdir}/${file}
@@ -240,18 +236,7 @@ fi
### Setup GNU gettext
dnl GNU gettext is written in C
AC_LANG_PUSH(C)
-# Some tests that may be useful for gettext
-AC_C_CONST
-AC_C_INLINE
-# Do the real setup now
AM_GNU_GETTEXT
-# a hack for those who try to change LyX, but do not have gettext installed
-case "${XGETTEXT}" in
- *:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
-esac
-
-AC_SUBST(LINGUAS)
-
AC_LANG_POP(C)
# some standard header files
Index: po/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/ChangeLog,v
retrieving revision 1.193
diff -u -p -r1.193 ChangeLog
--- po/ChangeLog 21 Feb 2005 09:28:12 -0000 1.193
+++ po/ChangeLog 11 Mar 2005 10:13:38 -0000
@@ -1,3 +1,7 @@
+2005-03-11 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * LINGUAS: new file. Lists the languages known to LyX.
+
2005-02-16 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* *.po: remerge with gettext 0.13
Index: po/LINGUAS
===================================================================
RCS file: po/LINGUAS
diff -N po/LINGUAS
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/LINGUAS 11 Mar 2005 10:13:38 -0000
@@ -0,0 +1,3 @@
+# The list of languages known to LyX
+bg ca cs da de es eu fi fr he hu it nl nn no pl pt ro ru sk sl sv tr wa
+
Index: po/POTFILES.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/POTFILES.in,v
retrieving revision 1.406
diff -u -p -r1.406 POTFILES.in
--- po/POTFILES.in 16 Feb 2005 16:20:52 -0000 1.406
+++ po/POTFILES.in 11 Mar 2005 10:13:38 -0000
@@ -39,6 +39,7 @@ src/frontends/gtk/GBC.h
src/frontends/gtk/GBox.C
src/frontends/gtk/GChanges.C
src/frontends/gtk/GCharacter.C
+src/frontends/gtk/GDocument.C
src/frontends/gtk/GERT.C
src/frontends/gtk/GErrorList.C
src/frontends/gtk/GFloat.C
