From 0254e21a5ce8128cd76242f4e476d0eb52924ec7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 25 Jan 2009 18:15:44 +0100 Subject: [PATCH] Don't install charset.alias on mingw and Cygwin. --- ChangeLog | 7 +++++++ modules/localcharset | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b762f920..e3be07ea7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-01-25 Bruno Haible + Don't install charset.alias on mingw and Cygwin. + * modules/localcharset (install-exec-local): Don't install + charset.alias on mingw and Cygwin, if the file does not yet exist. + The result for these platforms is hardcoded in localcharset.c. + +2009-01-25 Bruno Haible + Make it possible again to use AC_GNU_SOURCE together with gnulib. * m4/extensions.m4 (gl_USE_SYSTEM_EXTENSIONS): Require AC_GNU_SOURCE before requiring AC_USE_SYSTEM_EXTENSIONS. diff --git a/modules/localcharset b/modules/localcharset index f0b7ed719..ae42b032a 100644 --- a/modules/localcharset +++ b/modules/localcharset @@ -40,13 +40,25 @@ all-local: charset.alias ref-add.sed ref-del.sed charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp install-exec-local: all-local - test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir) + if test $(GLIBC21) = no; then \ + case '$(host_os)' in \ + cygwin* | mingw* | pw32* | cegcc*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ + esac ; \ + else \ + need_charset_alias=false ; \ + fi ; \ + if $$need_charset_alias; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir) ; \ + fi ; \ if test -f $(charset_alias); then \ sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ rm -f $(charset_tmp) ; \ else \ - if test $(GLIBC21) = no; then \ + if $$need_charset_alias; then \ sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ rm -f $(charset_tmp) ; \ -- 2.11.0