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
diff --git a/Makefile.am b/Makefile.am
index 6dde9b5..0cd3384 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 @@
 SUBDIRS += unix
 endif
 
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index ce74099..47091b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,8 +12,8 @@
 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 @@
 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