Skip to content

Commit d7999d3

Browse files
authored
[autotools] Fix breakage in cpp bindings's Makefile.in introduced in 4d1eb3c (#1098)
As reported in issue #1091, PR #1020, merged as 4d1eb3c, broke ./configure for the C++ bindings. This patch fixes it. Running autoreconf for cpp bindings modified Makefile.in files. The subtle changes in the paths are required to find required auxiliary files: config.guess config.sub ltmain.sh compile missing install-sh Fixes #1091
1 parent da2a674 commit d7999d3

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

bindings/cpp/Makefile.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,10 @@ am__define_uniq_tagged_files = \
184184
done | $(am__uniquify_input)`
185185
DIST_SUBDIRS = $(SUBDIRS)
186186
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/portaudiocpp.pc.in \
187-
AUTHORS COPYING ChangeLog INSTALL NEWS README compile \
188-
config.guess config.sub install-sh ltmain.sh missing
187+
$(top_srcdir)/../../compile $(top_srcdir)/../../config.guess \
188+
$(top_srcdir)/../../config.sub $(top_srcdir)/../../install-sh \
189+
$(top_srcdir)/../../ltmain.sh $(top_srcdir)/../../missing \
190+
AUTHORS COPYING ChangeLog INSTALL NEWS README
189191
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
190192
distdir = $(PACKAGE)-$(VERSION)
191193
top_distdir = $(distdir)

bindings/cpp/bin/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ AM_V_at = $(am__v_at_@AM_V@)
128128
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
129129
am__v_at_0 = @
130130
am__v_at_1 =
131-
depcomp = $(SHELL) $(top_srcdir)/depcomp
131+
depcomp = $(SHELL) $(top_srcdir)/../../depcomp
132132
am__maybe_remake_depfiles = depfiles
133133
am__depfiles_remade = $(BINDIR)/$(DEPDIR)/devs.Po \
134134
$(BINDIR)/$(DEPDIR)/sine.Po
@@ -175,7 +175,7 @@ am__define_uniq_tagged_files = \
175175
unique=`for i in $$list; do \
176176
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
177177
done | $(am__uniquify_input)`
178-
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
178+
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../../depcomp
179179
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
180180
ACLOCAL = @ACLOCAL@
181181
AMTAR = @AMTAR@

bindings/cpp/lib/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ AM_V_at = $(am__v_at_@AM_V@)
162162
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
163163
am__v_at_0 = @
164164
am__v_at_1 =
165-
depcomp = $(SHELL) $(top_srcdir)/depcomp
165+
depcomp = $(SHELL) $(top_srcdir)/../../depcomp
166166
am__maybe_remake_depfiles = depfiles
167167
am__depfiles_remade = $(SRCDIR)/$(DEPDIR)/BlockingStream.Plo \
168168
$(SRCDIR)/$(DEPDIR)/CFunCallbackStream.Plo \
@@ -223,7 +223,7 @@ am__define_uniq_tagged_files = \
223223
unique=`for i in $$list; do \
224224
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
225225
done | $(am__uniquify_input)`
226-
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
226+
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../../depcomp
227227
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
228228
ACLOCAL = @ACLOCAL@
229229
AMTAR = @AMTAR@

0 commit comments

Comments
 (0)