Move i18n dir back to lib/, after discussion with Bruno.

diff --git a/Makefile.am b/Makefile.am
index 59d8bf371d70b112e38253215e98f41ed89b6800..e6a46538c05274620837ba579ccf1436d91c6ab3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-SUBDIRS = lib libextra gl po src doc tests
+SUBDIRS = lib libextra gl src doc tests
 
 if HAVE_GUILE
 SUBDIRS += guile

diff --git a/configure.ac b/configure.ac
index 92c86e6ec0d19a7aa95d770fe94b04365f49179a..bb9b9a3ae83764e0ca44169e86723fc93f4224e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,9 +50,6 @@ fi
 gl_EARLY
 AC_C_INLINE
 
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
-
 AC_ARG_ENABLE(cxx,
   AS_HELP_STRING([--disable-cxx], [unconditionally disable the C++ library]),
     use_cxx=$enableval, use_cxx=yes)
@@ -249,7 +246,6 @@ AC_CONFIG_FILES([
   guile/modules/Makefile
   guile/src/Makefile
   guile/tests/Makefile
-  po/Makefile.in
   src/Makefile
   src/cfg/Makefile
   src/cfg/platon/Makefile

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5e224077cd757bc9e00c300e110f703cc5830435..8e8bd58873a5d3a92b75ebb4bafb3e3154b97424 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,7 +22,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 
-SUBDIRS = gl includes x509
+SUBDIRS = gl po includes x509
 if ENABLE_MINITASN1
 SUBDIRS += minitasn1
 endif

diff --git a/lib/configure.ac b/lib/configure.ac
index 8a4963a1625b13b15a37ab249209e2cbcd710629..47a4d27e057b7deaa4ba44f800d28eff61153c57 100644 (file)
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -37,6 +37,9 @@ AC_PROG_LIBTOOL
 
 LIBGNUTLS_HOOKS
 
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.17])
+
 AC_C_BIGENDIAN
 
 # For includes/gnutls/gnutls.h.in.
@@ -102,6 +105,7 @@ AC_CONFIG_FILES([
   minitasn1/Makefile
   opencdk/Makefile
   openpgp/Makefile
+  po/Makefile.in
   x509/Makefile
 ])
 AC_OUTPUT

diff --git a/po/LINGUAS b/lib/po/LINGUAS
similarity index 100%
rename from po/LINGUAS
rename to lib/po/LINGUAS

diff --git a/po/Makevars b/lib/po/Makevars
similarity index 100%
rename from po/Makevars
rename to lib/po/Makevars

diff --git a/po/POTFILES.in b/lib/po/POTFILES.in
similarity index 100%
rename from po/POTFILES.in
rename to lib/po/POTFILES.in

diff --git a/po/cs.po.in b/lib/po/cs.po.in
similarity index 100%
rename from po/cs.po.in
rename to lib/po/cs.po.in

diff --git a/po/de.po.in b/lib/po/de.po.in
similarity index 100%
rename from po/de.po.in
rename to lib/po/de.po.in

diff --git a/po/fr.po.in b/lib/po/fr.po.in
similarity index 100%
rename from po/fr.po.in
rename to lib/po/fr.po.in

diff --git a/po/ms.po.in b/lib/po/ms.po.in
similarity index 100%
rename from po/ms.po.in
rename to lib/po/ms.po.in

diff --git a/po/nl.po.in b/lib/po/nl.po.in
similarity index 100%
rename from po/nl.po.in
rename to lib/po/nl.po.in

diff --git a/po/pl.po.in b/lib/po/pl.po.in
similarity index 100%
rename from po/pl.po.in
rename to lib/po/pl.po.in

diff --git a/po/sv.po.in b/lib/po/sv.po.in
similarity index 100%
rename from po/sv.po.in
rename to lib/po/sv.po.in

diff --git a/po/vi.po.in b/lib/po/vi.po.in
similarity index 100%
rename from po/vi.po.in
rename to lib/po/vi.po.in