diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-03-08 01:16:01 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-03-08 03:11:11 +0100 |
| commit | 7e4c6ad74d4fcd68b9bece5c8379ba8e6807378d (patch) | |
| tree | e805c3e6857d7ac9d3eaea2b0a37e93303ba5a4b /modules/search | |
| parent | b2edc991146c2764f0f9c05aba07ad4002e12141 (diff) | |
| download | gnulib-7e4c6ad74d4fcd68b9bece5c8379ba8e6807378d.tar.gz | |
search: Avoid #define replacements in C++ mode.
Diffstat (limited to 'modules/search')
| -rw-r--r-- | modules/search | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/search b/modules/search index 898decefb6..dce574756a 100644 --- a/modules/search +++ b/modules/search @@ -7,6 +7,7 @@ m4/search_h.m4 Depends-on: arg-nonnull +c++defs include_next warn-on-use @@ -18,7 +19,7 @@ BUILT_SOURCES += search.h # We need the following in order to create <search.h> when the system # doesn't have one that works with the given compiler. -search.h: search.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) +search.h: search.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''HAVE_SEARCH_H''@|$(HAVE_SEARCH_H)|g' \ @@ -28,6 +29,7 @@ search.h: search.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) -e 's|@''GNULIB_TSEARCH''@|$(GNULIB_TSEARCH)|g' \ -e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \ -e 's|@''REPLACE_TSEARCH''@|$(REPLACE_TSEARCH)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ < $(srcdir)/search.in.h; \ |