Don't build locale/wcwidth junk if NLS is disabled.

[cdecl99.git] / lib / local / modules / gnulib-local

diff --git a/lib/local/modules/gnulib-local b/lib/local/modules/gnulib-local
index 20e312093a476168c52c53816fc9733bb550a6f7..ed362f6fa1e33a10722916c1508fd69cf0dc944a 100644 (file)
--- a/lib/local/modules/gnulib-local
+++ b/lib/local/modules/gnulib-local
@@ -3,29 +3,32 @@ Helper to export gnulib-tool local-dir settings to Automake and distribute
 files automatically.
 
 configure.ac:
+m4_set_add([DX_GNULIB_LOCAL_DIST], [modules/gnulib-local])dnl
 AC_REQUIRE([AC_PROG_AWK])dnl
 m4_pushdef([gl_LOCAL_DIR],
-  [m4_define([_GNULIB_LOCAL_DIR_], $][@)])m4_divert_push([KILL])
+  [m4_define([_DX_GNULIB_LOCAL_DIR_], $][@)])m4_divert_push([KILL])
 m4_include([m4/gnulib-cache.m4])
 m4_popdef([gl_LOCAL_DIR])m4_divert_pop([KILL])dnl
-AC_SUBST([GNULIB_LOCAL_DIR], m4_defn([_GNULIB_LOCAL_DIR_]))
+AC_SUBST([DX_GNULIB_LOCAL_DIR], m4_defn([_DX_GNULIB_LOCAL_DIR_]))
+
+AC_CONFIG_COMMANDS_PRE([AC_SUBST([DX_GNULIB_LOCAL_DIST],
+  ["m4_set_dump([DX_GNULIB_LOCAL_DIST], [ ])"])])
 
 Makefile.am:
-GNULIB_LOCAL_DIST = modules/gnulib-local
-GNULIB_LOCAL_DIRS_AWK = \
+DX_GNULIB_LOCAL_DIRS_AWK = \
        { for (i=1; i<=NF; i++) { sub(/\/[^\/]*$$/, "", $$i); dirs[$$i]=1; } } \
        END { for (i in dirs) print outdir "/" i; }
 
 dist-hook: dist-gnulib-local
 dist-gnulib-local:
        save_IFS=$$IFS; \
-       IFS=:; set x $(GNULIB_LOCAL_DIR); shift; \
+       IFS=:; set x $(DX_GNULIB_LOCAL_DIR); shift; \
        IFS=$$save_IFS; \
        outdir="$(top_distdir)/$$1"; \
-       dirs=`echo $(GNULIB_LOCAL_DIST) \
-             | $(AWK) '$(GNULIB_LOCAL_DIRS_AWK)' outdir="$$outdir"`; \
+       dirs=`echo $(DX_GNULIB_LOCAL_DIST) \
+             | $(AWK) '$(DX_GNULIB_LOCAL_DIRS_AWK)' outdir="$$outdir"`; \
        ( set -x; $(MKDIR_P) $$dirs && chmod u+w $$dirs ) || exit; \
-       for f in $(GNULIB_LOCAL_DIST); do \
+       for f in $(DX_GNULIB_LOCAL_DIST); do \
          for indir; do \
            test -f "$(top_srcdir)/$$indir/$$f" || continue; \
            ( set -x; cp -p "$(top_srcdir)/$$indir/$$f" "$$outdir/$$f" ) || exit; \