[v9_9] [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 e7307ab1cde0d3c4732ae9493d91f5d0003f7e3b..c4abda575ba869bdff6cc858ca54752edc1208a4 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 78fee00a50b626b7e8199fcd3c2794e484e40580..0475f1bab7f5566da9aa116d62466401ee192585 100755 (executable)
--- a/configure
+++ b/configure
@@ -795,6 +795,7 @@ O
 ALWAYS_MAKE_SYMTABLE
 MKSYMTBL_PROGRAM
 ISC_PLATFORM_USEBACKTRACE
+INSTALL_LIBRARY
 PURIFY
 purify_path
 IRIX_DNSSEC_WARNINGS_HACK
@@ -15937,7 +15938,6 @@ esac
 
 
 
-
 # Check whether --with-libtool was given.
 if test "${with_libtool+set}" = set; then :
   withval=$with_libtool; use_libtool="$withval"
@@ -15955,6 +15955,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
@@ -15974,9 +15975,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 1d7e89ecc6cbb9d987b659e2836b807a710eea01..8403790400bf436685c15b19511de980f1231722 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1712,7 +1712,6 @@ esac
 
 AC_SUBST(PURIFY)
 
-
 AC_ARG_WITH(libtool,
            [  --with-libtool          use GNU libtool],
            use_libtool="$withval", use_libtool="no")
@@ -1726,6 +1725,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
@@ -1745,8 +1745,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 a3e3e9a4e86ac8debcb957e13b0e97862fa650c0..ac220bd9555f3e1678f82c10c62d7769db3e6598 100644 (file)
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -142,7 +142,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 f513eb97ff9ebb962226dc1897935b716fd01250..e4eb83785d9a020e39ac3764a71d5defffa592de 100644 (file)
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -134,7 +134,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 37bc50d82fecf2e47f40dbd6d4f23fd5b5ba4ac9..52eb087ff9db92a5da60799828d81ce695a91261 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