From 8cfa1eda338a5647282d0464558a67eed9d10b70 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 7 Sep 2009 10:34:58 +0000 Subject: [PATCH] Fix compilation of i18n bits. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/unified_buildsys@3897 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- Makefile.am | 3 ++- configure.ac | 5 +++-- {unix/po => po}/LINGUAS | 0 {unix/po => po}/Makevars | 0 {unix/po => po}/POTFILES.in | 0 {unix/po => po}/Rules-quot | 0 {unix/po => po}/boldquot.sed | 0 {unix/po => po}/de.po | 0 {unix/po => po}/en@boldquot.header | 0 {unix/po => po}/en@quot.header | 0 {unix/po => po}/insert-header.sin | 0 {unix/po => po}/pl.po | 0 {unix/po => po}/quot.sed | 0 {unix/po => po}/remove-potcdate.sin | 0 {unix/po => po}/ru.po | 0 {unix/po => po}/sk.po | 0 {unix/po => po}/sv.po | 0 {unix/po => po}/tigervnc.pot | 0 18 files changed, 5 insertions(+), 3 deletions(-) rename {unix/po => po}/LINGUAS (100%) rename {unix/po => po}/Makevars (100%) rename {unix/po => po}/POTFILES.in (100%) rename {unix/po => po}/Rules-quot (100%) rename {unix/po => po}/boldquot.sed (100%) rename {unix/po => po}/de.po (100%) rename {unix/po => po}/en@boldquot.header (100%) rename {unix/po => po}/en@quot.header (100%) rename {unix/po => po}/insert-header.sin (100%) rename {unix/po => po}/pl.po (100%) rename {unix/po => po}/quot.sed (100%) rename {unix/po => po}/remove-potcdate.sin (100%) rename {unix/po => po}/ru.po (100%) rename {unix/po => po}/sk.po (100%) rename {unix/po => po}/sv.po (100%) rename {unix/po => po}/tigervnc.pot (100%) diff --git a/Makefile.am b/Makefile.am index 6dde9b56..0cd33847 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = common +SUBDIRS = common po if BUILD_WIN SUBDIRS += win @@ -6,3 +6,4 @@ else SUBDIRS += unix endif +ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index ce740990..47091b4b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,8 +12,8 @@ AC_PROG_CC AC_PROG_CXX AC_PROG_LIBTOOL AC_LANG([C++]) -dnl AM_GNU_GETTEXT([external]) -dnl AM_GNU_GETTEXT_VERSION([0.14.1]) +AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION([0.14.1]) case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) @@ -160,4 +160,5 @@ unix/vncpasswd/Makefile win/Makefile win/vncviewer/Makefile win/rfb_win32/Makefile +po/Makefile.in ]) diff --git a/unix/po/LINGUAS b/po/LINGUAS similarity index 100% rename from unix/po/LINGUAS rename to po/LINGUAS diff --git a/unix/po/Makevars b/po/Makevars similarity index 100% rename from unix/po/Makevars rename to po/Makevars diff --git a/unix/po/POTFILES.in b/po/POTFILES.in similarity index 100% rename from unix/po/POTFILES.in rename to po/POTFILES.in diff --git a/unix/po/Rules-quot b/po/Rules-quot similarity index 100% rename from unix/po/Rules-quot rename to po/Rules-quot diff --git a/unix/po/boldquot.sed b/po/boldquot.sed similarity index 100% rename from unix/po/boldquot.sed rename to po/boldquot.sed diff --git a/unix/po/de.po b/po/de.po similarity index 100% rename from unix/po/de.po rename to po/de.po diff --git a/unix/po/en@boldquot.header b/po/en@boldquot.header similarity index 100% rename from unix/po/en@boldquot.header rename to po/en@boldquot.header diff --git a/unix/po/en@quot.header b/po/en@quot.header similarity index 100% rename from unix/po/en@quot.header rename to po/en@quot.header diff --git a/unix/po/insert-header.sin b/po/insert-header.sin similarity index 100% rename from unix/po/insert-header.sin rename to po/insert-header.sin diff --git a/unix/po/pl.po b/po/pl.po similarity index 100% rename from unix/po/pl.po rename to po/pl.po diff --git a/unix/po/quot.sed b/po/quot.sed similarity index 100% rename from unix/po/quot.sed rename to po/quot.sed diff --git a/unix/po/remove-potcdate.sin b/po/remove-potcdate.sin similarity index 100% rename from unix/po/remove-potcdate.sin rename to po/remove-potcdate.sin diff --git a/unix/po/ru.po b/po/ru.po similarity index 100% rename from unix/po/ru.po rename to po/ru.po diff --git a/unix/po/sk.po b/po/sk.po similarity index 100% rename from unix/po/sk.po rename to po/sk.po diff --git a/unix/po/sv.po b/po/sv.po similarity index 100% rename from unix/po/sv.po rename to po/sv.po diff --git a/unix/po/tigervnc.pot b/po/tigervnc.pot similarity index 100% rename from unix/po/tigervnc.pot rename to po/tigervnc.pot -- 2.39.5