clean-up gettext support code

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9710 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 91fe0ffdee5a0ea5ac03d89f3254f4969cd318f1..9898af15f791701426bf920e2457f166f040dcec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-11  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * 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  <Georg.Baum@post.rwth-aachen.de>
 
        * autogen.sh: remove autom4te.cache directories

diff --git a/configure.ac b/configure.ac
index 22d7a7e52a982678a4516dba290048ded78d46e3..0983d990c2c7dcdfcdb7ad6fc4374621830c412f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/po/ChangeLog b/po/ChangeLog
index 893040eb1085b3bb52faae52e2f2f9bd7b626391..878549f929a1cbdfd12a387b1933d96daa8dcd8a 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-11  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * LINGUAS: new file. Lists the languages known to LyX.
+
 2005-02-16  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * *.po: remerge with gettext 0.13

diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644 (file)
index 0000000..f015d6f
--- /dev/null
+++ b/po/LINGUAS
@@ -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
+

diff --git a/po/POTFILES.in b/po/POTFILES.in
index fd6bea4257f9432da73e5aec2bf15664bd03e204..370e93568678bfea8764c07f84cd84afc4abb5e8 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -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