diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-04-25 23:27:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-04-25 23:59:37 +0200 |
| commit | dd7d0148f221c3180ab6f31c8742aaf4d0e5926a (patch) | |
| tree | 1aec441600e3d3ff9aec482ba26656e523b90a72 /m4/iconv_h.m4 | |
| parent | eb0ffdd8190bff165120b881ca3e1702be82c83a (diff) | |
| download | guile-dd7d0148f221c3180ab6f31c8742aaf4d0e5926a.tar.gz | |
Update Gnulib to v0.0-5158-g7d06b32; remove `strcase' and `version-etc-fsf'.
* m4/gnulib-cache.m4: Remove `strcase' and `version-etc-fsf'.
* configure.ac (POTENTIAL_GCC_CFLAGS): Remove `-Wundef'.
* libguile/script.c: Don't include <version-etc.h>.
Diffstat (limited to 'm4/iconv_h.m4')
| -rw-r--r-- | m4/iconv_h.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 index abfacffb4..8cca7fd80 100644 --- a/m4/iconv_h.m4 +++ b/m4/iconv_h.m4 @@ -1,4 +1,4 @@ -# iconv_h.m4 serial 7 +# iconv_h.m4 serial 8 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,6 +18,7 @@ AC_DEFUN([gl_REPLACE_ICONV_H], [ AC_REQUIRE([gl_ICONV_H_DEFAULTS]) ICONV_H='iconv.h' + AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"]) ]) AC_DEFUN([gl_ICONV_MODULE_INDICATOR], @@ -36,4 +37,5 @@ AC_DEFUN([gl_ICONV_H_DEFAULTS], REPLACE_ICONV_OPEN=0; AC_SUBST([REPLACE_ICONV_OPEN]) REPLACE_ICONV_UTF=0; AC_SUBST([REPLACE_ICONV_UTF]) ICONV_H=''; AC_SUBST([ICONV_H]) + AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"]) ]) |