From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 7 Sep 2021 08:31:37 +0000 (+0200)
Subject: Merge branch 'libtool' of https://github.com/orbea/ldns into orbea-libtool
X-Git-Tag: 1.8.0-rc.1~19^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da3080453184573309659061cc4db2c6249131ef;p=thirdparty%2Fldns.git

Merge branch 'libtool' of https://github.com/orbea/ldns into orbea-libtool
---

da3080453184573309659061cc4db2c6249131ef
diff --cc Makefile.in
index ef4feaea,400b593d..89fdf387
--- a/Makefile.in
+++ b/Makefile.in
@@@ -324,10 -324,10 +324,10 @@@ ldns_wrapper.lo: $(pywrapdir)/ldns_wrap
  	$(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
  
  _ldns.la: ldns_wrapper.lo libldns.la
- 	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(PYTHON_LIBS) $(LIBS)
 -	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) $(LIB) $(LIBS)
++	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) $(LIB) $(PYTHON_LIBS) $(LIBS)
  
  $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
- 	BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"
+ 	BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="$$BUILDDIR/$(LIB)" INC="-I$$BUILDDIR"
  
  $(p5_dns_ldns_dir)/blib/arch/auto/DNS/LDNS/LDNS.so: $(p5_dns_ldns_dir)/Makefile
  	cd $(p5_dns_ldns_dir); $(MAKE)