[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 d447d141f3c4cab614707dc6d821ca3478f75a8b..dacf7152a81c156cdf6bdd3d17d2a069a2854fc9 100644 (file)
--- 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 c0d2ffbc5d20a73d09c2a1676d3410235e9c55af..e759773150fa332fbfd857dc8b36ae815d4fe7fa 100755 (executable)
--- 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 46f0c287fdcf876fe2dc5a8a98ae08181e9f30f0..80b8cc106b32b2cf0a76eec6fdc6d549d03e79f2 100644 (file)
--- 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 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 51d60666dec343c499ab108e1de76a94a3f32efc..cd8af17320fa07be6b2ccbdfd4d92eecb926e138 100644 (file)
--- 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 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 4d76b94968daca4bf18e9b5d66b8007f39df9cf0..3b3d940a73c2a520d0cb1f2a03859a8fb9b2ebf5 100644 (file)
--- 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 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 19ec61edd9e3314a0994c5bb11d6456650c961a3..2c0e676f014a0ab84f6b89d691734fed546231fc 100644 (file)
--- 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 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 ae02766604de4253ac11a689145776f9561f0d20..e5fee1700878df4e4a7ef05c31c83101309b8515 100644 (file)
--- 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