]> git.ipfire.org Git - thirdparty/squid.git/commit
Fixed linking with libecap after PKG_CHECK_MODULES changes.
authorAlex Rousskov <rousskov@measurement-factory.com>
Thu, 17 Feb 2011 19:11:06 +0000 (12:11 -0700)
committerAlex Rousskov <rousskov@measurement-factory.com>
Thu, 17 Feb 2011 19:11:06 +0000 (12:11 -0700)
commit7b4422de9e3670d9166112a5ac8c4796d36825d6
tree32c9ee344a5f88f3b5d3c35c94fb0f31e570945f
parent80ab04bb3148ee8dcce40704e4b382d24fb4c50a
Fixed linking with libecap after PKG_CHECK_MODULES changes.

Previous commit (r11126) made sense and seemed to work fine until I
discovered that touching a source file in src/adaptation/ecap and
running "make" there leads to libtool's "file not found" errors for some
libtool-generated internal file. However, "make clean all" would still
work.

To better diagnose the issue, I renamed PKG_CHECK_MODULES prefix to
EXTLIBECAP and our ecap/libecap to ecap/libxecap. The difference in
names allowed to distinguish external libecap-related names/failures
from internal ones, but it did not solve the problem.

Moving EXTLIBECAP_LIBS from adaptation/ecap/ to adaptation/ Makefile.am
helped.  Older code included external libecap in adaptation/Makefile.am
as well, perhaps to avoid similar problems. It does not make sense to
put external libecap there instead of the ecap-specific directory, but
it works.
configure.ac
src/adaptation/Makefile.am
src/adaptation/ecap/Makefile.am