From b71d819fbb8b0319e5fe9bd2bf72f0000c6b7d82 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Wed, 28 Dec 2011 14:55:57 +0400 Subject: [PATCH] Fix configure --enable-cplusplus make install * Makefile.am (pkginclude_HEADERS): Remove gc_allocator.h entry. * Makefile.am (include_HEADERS): Add include/extra/gc_cpp.h entry (only if CPLUSPLUS). * include/include.am (pkginclude_HEADERS): Remove include/gc_cpp.h entry. * include/include.am (include_HEADERS): Remove include/extra/gc_cpp.h entry. --- Makefile.am | 3 ++- include/include.am | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 37576018..f8a16603 100644 --- a/Makefile.am +++ b/Makefile.am @@ -105,7 +105,8 @@ EXTRA_libgc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \ if CPLUSPLUS lib_LTLIBRARIES += libgccpp.la -pkginclude_HEADERS += include/gc_cpp.h include/gc_allocator.h +pkginclude_HEADERS += include/gc_cpp.h +include_HEADERS += include/extra/gc_cpp.h libgccpp_la_SOURCES = gc_cpp.cc libgccpp_la_LIBADD = ./libgc.la libgccpp_la_LDFLAGS = -version-info 1:3:0 -no-undefined diff --git a/include/include.am b/include/include.am index c7e3b67d..079c0424 100644 --- a/include/include.am +++ b/include/include.am @@ -17,7 +17,6 @@ pkginclude_HEADERS += \ include/gc_allocator.h \ include/gc_backptr.h \ include/gc_config_macros.h \ - include/gc_cpp.h \ include/gc_disclaim.h \ include/gc_gcj.h \ include/gc_inline.h \ @@ -52,5 +51,4 @@ dist_noinst_HEADERS += \ # unprefixed header include_HEADERS += \ - include/extra/gc.h \ - include/extra/gc_cpp.h + include/extra/gc.h -- 2.50.1