From: Evan Hunt <each@isc.org>
Date: Fri, 5 Sep 2014 17:29:17 +0000 (-0700)
Subject: [v9_8] [rt36786] use INSTALL_PROGRAM for shared libs
X-Git-Tag: v9.8.8rc2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df10dcf8995f33c2b04e6a7b841766cc8fbb46ca;p=thirdparty%2Fbind9.git

[v9_8] [rt36786] use INSTALL_PROGRAM for shared libs

3947.	[cleanup]	Set the executable bit on libraries when using
			libtool. [RT #36786]

(cherry picked from commit f687e639f00a31e0884fb2c95a627b10b50c364b)
(cherry picked from commit 38398c590ab7aeb5c3d3749c1a8d672e6f2f138c)
---

diff --git a/CHANGES b/CHANGES
index d447d141f3c..dacf7152a81 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3947.	[cleanup]	Set the executable bit on libraries when using
+			libtool. [RT #36786]
+
 3945.	[bug]		Invalid wildcard expansions could be incorrectly
 			accepted by the validator. [RT #37093]
 
diff --git a/configure b/configure
index c0d2ffbc5d2..e759773150f 100755
--- a/configure
+++ b/configure
@@ -793,6 +793,7 @@ O
 ALWAYS_MAKE_SYMTABLE
 MKSYMTBL_PROGRAM
 ISC_PLATFORM_USEBACKTRACE
+INSTALL_LIBRARY
 PURIFY
 purify_path
 IRIX_DNSSEC_WARNINGS_HACK
@@ -15595,7 +15596,6 @@ esac
 
 
 
-
 # Check whether --with-libtool was given.
 if test "${with_libtool+set}" = set; then :
   withval=$with_libtool; use_libtool="$withval"
@@ -15613,6 +15613,7 @@ case $use_libtool in
 		LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
 		LIBTOOL_MODE_INSTALL='--mode=install --tag=CC'
 		LIBTOOL_MODE_LINK='--mode=link --tag=CC'
+		INSTALL_LIBRARY='${INSTALL_PROGRAM}'
 		case "$host" in
 		*) LIBTOOL_ALLOW_UNDEFINED= ;;
 		esac
@@ -15632,9 +15633,11 @@ case $use_libtool in
 		LIBTOOL_MODE_LINK=
 		LIBTOOL_ALLOW_UNDEFINED=
 		LIBTOOL_IN_MAIN=
+		INSTALL_LIBRARY='${INSTALL_DATA}'
 		;;
 esac
 
+
 #
 # enable/disable dumping stack backtrace.  Also check if the system supports
 # glibc-compatible backtrace() function.
diff --git a/configure.in b/configure.in
index 46f0c287fdc..80b8cc106b3 100644
--- a/configure.in
+++ b/configure.in
@@ -1574,7 +1574,6 @@ esac
 
 AC_SUBST(PURIFY)
 
-
 AC_ARG_WITH(libtool,
 	    [  --with-libtool          use GNU libtool],
 	    use_libtool="$withval", use_libtool="no")
@@ -1588,6 +1587,7 @@ case $use_libtool in
 		LIBTOOL_MODE_COMPILE='--mode=compile --tag=CC'
 		LIBTOOL_MODE_INSTALL='--mode=install --tag=CC'
 		LIBTOOL_MODE_LINK='--mode=link --tag=CC'
+		INSTALL_LIBRARY='${INSTALL_PROGRAM}'
 		case "$host" in
 		*) LIBTOOL_ALLOW_UNDEFINED= ;;
 		esac
@@ -1607,8 +1607,10 @@ case $use_libtool in
 		LIBTOOL_MODE_LINK=
 		LIBTOOL_ALLOW_UNDEFINED=
 		LIBTOOL_IN_MAIN=
+		INSTALL_LIBRARY='${INSTALL_DATA}'
 		;;
 esac
+AC_SUBST(INSTALL_LIBRARY)
 
 #
 # enable/disable dumping stack backtrace.  Also check if the system supports
diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index b6633e56f5e..1ef7c92e7e4 100644
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -79,7 +79,7 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libbind9.@A@ ${DESTDIR}${libdir}
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libbind9.@A@ ${DESTDIR}${libdir}
 
 clean distclean::
 	rm -f libbind9.@A@ timestamp
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 51d60666dec..cd8af17320f 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -138,7 +138,7 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns.@A@ ${DESTDIR}${libdir}
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libdns.@A@ ${DESTDIR}${libdir}
 
 clean distclean::
 	rm -f libdns.@A@ timestamp
diff --git a/lib/irs/Makefile.in b/lib/irs/Makefile.in
index c59af263fe4..ba802bf4783 100644
--- a/lib/irs/Makefile.in
+++ b/lib/irs/Makefile.in
@@ -74,7 +74,7 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libirs.@A@ ${DESTDIR}${libdir}
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libirs.@A@ ${DESTDIR}${libdir}
 
 clean distclean::
 	rm -f libirs.@A@ libirs.la timestamp
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 4d76b94968d..3b3d940a73c 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -133,7 +133,7 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ ${DESTDIR}${libdir}
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisc.@A@ ${DESTDIR}${libdir}
 
 clean distclean::
 	rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \
diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index efa834133c7..c084272ac92 100644
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -80,7 +80,7 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccc.@A@ ${DESTDIR}${libdir}
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisccc.@A@ ${DESTDIR}${libdir}
 
 clean distclean::
 	rm -f libisccc.@A@ timestamp
diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index 19ec61edd9e..2c0e676f014 100644
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -78,7 +78,7 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg.@A@ ${DESTDIR}${libdir}
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} libisccfg.@A@ ${DESTDIR}${libdir}
 
 clean distclean::
 	rm -f libisccfg.@A@ timestamp
diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in
index 3eba053969a..dd8eb65eed5 100644
--- a/lib/lwres/Makefile.in
+++ b/lib/lwres/Makefile.in
@@ -78,7 +78,7 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} liblwres.@A@ ${DESTDIR}${libdir}
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_LIBRARY} liblwres.@A@ ${DESTDIR}${libdir}
 
 clean distclean::
 	rm -f liblwres.@A@ liblwres.la timestamp
diff --git a/make/rules.in b/make/rules.in
index ae02766604d..e5fee170087 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -303,6 +303,7 @@ INSTALL_PROGRAM =	@INSTALL_PROGRAM@
 LINK_PROGRAM =		@LN_S@
 INSTALL_SCRIPT =	@INSTALL_SCRIPT@
 INSTALL_DATA =		@INSTALL_DATA@
+INSTALL_LIBRARY =	@INSTALL_LIBRARY@
 
 ###
 ### Programs used when generating documentation.  It's ok for these