org.guifications.gf2: ca91f585564dac522165ea28f42c2b0499830db7

[rekkanoryo at guifications.org]

-----------------------------------------------------------------
Revision: ca91f585564dac522165ea28f42c2b0499830db7
Ancestor: a2f27c3f47efff0c5fdf50ad752d521bbde96088
Author: rekkanoryo at guifications.org
Date: 2008-03-30T16:56:13
Branch: org.guifications.gf2

Modified files:
        Makefile.am configure.ac

ChangeLog: 

And restore --disable-nls here too.

-----------------------------------------------------------------
This revision's diffstat output:
 Makefile.am  |    6 +++++-
 configure.ac |    7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
-------------- next part --------------
============================================================
--- Makefile.am	fc4e2dfe8e48d47581f816f80e5ce2834f1e7118
+++ Makefile.am	ed15ca0dd2fdc3813e41ea05c157ff66b32a4d0f
@@ -25,8 +25,12 @@ DISTCLEANFILES = \
 	intltool-update \
 	intltool-merge
 
-SUBDIRS = doc nsis pixmaps po src themes
+if INSTALL_I18N
+PO_DIR=po
+endif
 
+SUBDIRS = doc nsis pixmaps $(PO_DIR) src themes
+
 BUILT_SOURCES = gf_config.h
 
 $(OBJECTS): $(BUILT_SOURCES)
============================================================
--- configure.ac	fcde5da5fa0845f316db579a34f34b3db21e4b06
+++ configure.ac	35cd52083a2519e99e370148d6c6f9a39a5fb0e5
@@ -130,6 +130,13 @@ AM_CONDITIONAL(PLUGINS, test "$want_plug
 want_plugins=yes
 AM_CONDITIONAL(PLUGINS, test "$want_plugins" = "yes")
 
+dnl #######################################################################
+dnl # Disable installation of translation files
+dnl #######################################################################
+AC_ARG_ENABLE(nls, AC_HELP_STRING([--enable-nls], [enable installation of translation files]), enable_i18n="$enableval", enable_i18n=yes)
+
+AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes")
+
 #
 # Version stuff
 #