From: Amos Jeffries Date: Thu, 26 Aug 2010 01:12:07 +0000 (-0600) Subject: Make the LTDL loadable modules paths global X-Git-Tag: take1~326 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=064d26a22e2fde0ebaa951946d5269b72c18deba;p=thirdparty%2Fsquid.git Make the LTDL loadable modules paths global Still wrapped for as-needed. May be needed by many places by src/ code --- diff --git a/src/Common.am b/src/Common.am index 00e41356ec..96a08812a5 100644 --- a/src/Common.am +++ b/src/Common.am @@ -24,6 +24,12 @@ INCLUDES = \ ## Because we use libcompat for comm_err.h header protections ... INCLUDES += $(KRB5INCS) +## Loadable Modules requires LTDL include paths. +## Because we need this to use the libray linking headers... +if USE_LOADABLE_MODULES +INCLUDES += $(INCLTDL) +endif + ## make all compiled sources depend on generated files ## XXX: Do we really need this? Does auto-dependency tracking work? $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h diff --git a/src/adaptation/Makefile.am b/src/adaptation/Makefile.am index e8d2480699..5ecd433aec 100644 --- a/src/adaptation/Makefile.am +++ b/src/adaptation/Makefile.am @@ -12,11 +12,6 @@ if USE_ECAP SUBDIRS += ecap endif -if USE_LOADABLE_MODULES -## LTDL headers require their local include path... -INCLUDES += $(INCLTDL) -endif - noinst_LTLIBRARIES = libadaptation.la ## start with the code shared among all adaptation schemes