diff --git a/CHANGES b/CHANGES index fa805b0504..2cd9c556d1 100644 --- 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 a8a7ac780e..0767035bde 100755 --- 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 cf0ce14178..f40f98a585 100644 --- 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 b6633e56f5..1ef7c92e7e 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 e53f3f407a..33463bb6ff 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -156,7 +156,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 c59af263fe..ba802bf478 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 c6649ae945..077e3237fa 100644 --- a/lib/isc/Makefile.in +++ b/lib/isc/Makefile.in @@ -140,7 +140,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 efa834133c..c084272ac9 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 4826714137..32261373f4 100644 --- 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 3eba053969..dd8eb65eed 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 331fbd5041..1479fa714e 100644 --- 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