Frankly I can't remember why I made these changes. Unless someone
else can figure it out, I'm not going to check in this patch for now.
Index: merge/Smake
===================================================================
--- merge.orig/Smake 2007-06-05 09:16:10.000000000 -0700
+++ merge/Smake 2007-06-05 09:18:06.000000000 -0700
@@ -75,6 +76,8 @@
--doc-base=gl/doc --import $(GNULIB_MODULES)
echo '*' > gl/.cvsignore
echo '*' > gl/m4/.cvsignore
+ test -d intl || mkdir intl
+ echo '*' > intl/.cvsignore
libtoolize --force --automake
autopoint --force
aclocal -I m4 -I gl/m4
@@ -85,7 +88,7 @@
gettextize:
test -d m4 || mkdir m4
touch m4/Makefile.am
- gettextize --force --no-changelog
+ gettextize -f -c --intl --no-changelog
po/POTFILES.in:
for f in `find src \( -name \*.[qc] -o -name \*.glade \) ! -name .\*
-print` ; do \
@@ -132,7 +135,6 @@
rm -f mdate-sh texinfo.tex
rm -f doc/stamp-vti
rm -f config.h.in~
- rm -f config.h.in
find . -name Makefile.in -exec rm -f {} \;
rm -f compile
rm -f ltmain.sh
Index: merge/configure.ac
===================================================================
--- merge.orig/configure.ac 2007-06-05 09:16:10.000000000 -0700
+++ merge/configure.ac 2007-06-05 09:18:06.000000000 -0700
@@ -22,8 +22,8 @@
PSPP_PERL
dnl Internationalization macros.
-AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION([0.16.1])
+AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.14.5])
dnl Checks for libraries.
AC_SYS_LARGEFILE
@@ -99,7 +99,7 @@
PSPP_CHECK_PREREQS
-AC_CONFIG_FILES([Makefile gl/Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])
AC_OUTPUT
--
_______________________________________________
pspp-dev mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/pspp-dev
