[v9_10] [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)

diff --git a/CHANGES b/CHANGES
index 3c37ef804f1f85b607ef3053f0f1a5c1144627c2..877cd9948176bce3b0b7dd56fa6c7ad34c3e564a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3947.  [cleanup]       Set the executable bit on libraries when using
+                       libtool. [RT #36786]
+
 3946.  [cleanup]       Improved "configure" search for a python interpreter.
                        [RT #36992]
 

diff --git a/configure b/configure
index b27d6439ba3467c360fa87b34f4011f38e5c0fb0..8436f2e0fbdc0c58db7cb80751c8d052c762e323 100755 (executable)
--- a/configure
+++ b/configure
@@ -831,6 +831,7 @@ OPENSSLGOSTLINKOBJS
 DST_OPENSSL_INC
 HAVE_SIT
 ISC_PLATFORM_USESIT
+INSTALL_LIBRARY
 ISC_THREAD_DIR
 THREADOPTSRCS
 THREADOPTOBJS
@@ -15336,6 +15337,7 @@ $as_echo "yes" >&6; }
                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
@@ -15357,9 +15359,11 @@ $as_echo "no" >&6; }
                LIBTOOL_MODE_LINK=
                LIBTOOL_ALLOW_UNDEFINED=
                LIBTOOL_IN_MAIN=
+               INSTALL_LIBRARY='${INSTALL_DATA}'
                ;;
 esac
 
+
 #
 # was --enable-native-pkcs11 specified?
 #  (note it implies both --without-openssl and --with-pkcs11)

diff --git a/configure.in b/configure.in
index fa24451067a54f6f66f26469d20d1a6da18a52ff..d584288e182e02ce3b2f412743985491f5eaf88d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1249,6 +1249,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
@@ -1269,8 +1270,10 @@ case $use_libtool in
                LIBTOOL_MODE_LINK=
                LIBTOOL_ALLOW_UNDEFINED=
                LIBTOOL_IN_MAIN=
+               INSTALL_LIBRARY='${INSTALL_DATA}'
                ;;
 esac
+AC_SUBST(INSTALL_LIBRARY)
 
 #
 # was --enable-native-pkcs11 specified?

diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index b6633e56f5e0f91b41a794609346aa75eac8cba0..1ef7c92e7e41dce51e806b8620ba5050518561c3 100644 (file)
--- 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 1b83006f61339b079fe950232bc2a5bf41eb124d..6dfd146f57039ff5dcd9086a78ebe1aebebb2e22 100644 (file)
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -155,7 +155,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 c59af263fe4b4f170c73337c104229cee57ec0ee..ba802bf478331494c6875632f076a4a45a05bd69 100644 (file)
--- 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 ba0838f65fe6599945cb3dfeaf553094bb738554..e0b2038f16fdf62977cc5ff730c1d950d6a3e8c8 100644 (file)
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -138,7 +138,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 efa834133c7352b4b84ea77469bd58378e59525e..c084272ac927c1e050048cf11bca89a771dfc9ae 100644 (file)
--- 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 4826714137eb6963c556d00fb0191dfc1008a8d0..32261373f4141eb9cca13db644783131c0c11f5c 100644 (file)
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -80,7 +80,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 3eba053969ab28c976e7fc16e89fefc75bcaf4c3..dd8eb65eed5f5efcf56759e2fc76482be431226b 100644 (file)
--- 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 331fbd5041423c078df8a7849c8f6606072cad8c..1479fa714e4878c7c9610b266cb53eac21c9a9a3 100644 (file)
--- a/make/rules.in
+++ b/make/rules.in
@@ -300,6 +300,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