The attached simple patch re-establishes earlier behaviour where
it was possible to build lyx without a po/POTFILES.in present.
The trick is to make the newer code in gettext.m4 think that a
valid po/POTFILES.in exists so it will generate po/Makefile. Then
remove po/POTFILES.in and when you run make the real po/POTFILES.in is
rebuilt and a fresh (correct) Makefile is rebuilt.
This simple fix doesn't touch gettext.m4 but works with/around it.
As such it should be future proof.
Allan. (ARRae)
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.835
diff -u -p -r1.835 ChangeLog
--- ChangeLog 31 Mar 2002 14:52:58 -0000 1.835
+++ ChangeLog 2 Apr 2002 02:48:24 -0000
@@ -1,3 +1,11 @@
+2002-04-02 Allan Rae <[EMAIL PROTECTED]>
+
+ * configure.in: allow building when po/POTFILES.in is missing by
+ pretending it is there long enough to trick gettext.m4 into producing
+ po/Makefile and then deleting po/POTFILES* so the real ones can be
+ generated during a make. It is now possible to remove po/POTFILES.in
+ from CVS. Although it should still be included in the dist.
+
2002-03-31 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
* configure.in: call LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG
Index: configure.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.in,v
retrieving revision 1.105
diff -u -p -r1.105 configure.in
--- configure.in 31 Mar 2002 14:52:58 -0000 1.105
+++ configure.in 2 Apr 2002 02:48:24 -0000
@@ -269,6 +269,12 @@ AM_GNU_GETTEXT
case "${XGETTEXT}" in
*:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
esac
+# a hack for those building LyX without a po/POTFILES.in
+# to ensure that po/Makefile is generated so we can make a new po/POTFILES
+if test ! -f $srcdir/po/POTFILES.in ; then
+ touch $srcdir/po/POTFILES.in
+ POTFILES_IN_TOUCHED="yes"
+fi
AC_SUBST(LINGUAS)
@@ -371,6 +377,11 @@ AC_OUTPUT([Makefile \
src/frontends/qt2/ui/moc/Makefile \
src/frontends/gnome/Makefile \
])
+
+# finish the po/.POTFILES.in hack
+if test "x$POTFILES_IN_TOUCHED" = "xyes" ; then
+ rm -f $srcdir/po/POTFILES*
+fi
# show version information
echo
