3485. [cleanup] Only compile openssl_gostlink.c if we support GOST.

(cherry picked from commit 7e9ccec63889f2aabee59b94307be492a77fa93b)

diff --git a/CHANGES b/CHANGES
index 0bf38d7b72e255c000de6720150568f52b5171e9..10e6434f53d8abc40a8982380386bbd30d693f7c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3485.  [cleanup]       Only compile openssl_gostlink.c if we support GOST.
+
 3483.  [bug]           Corrected XSL code in use with --enable-newstats.
                        [RT #32587]
 

diff --git a/configure b/configure
index d47feb1bb23f4052c75ed228264c4e897ccc8977..f06bfef579ff87589428dadff5966eef1ebfd100 100755 (executable)
--- a/configure
+++ b/configure
@@ -1320,6 +1320,8 @@ OPENSSL_GOST
 OPENSSL_ECDSA
 OPENSSLLINKSRCS
 OPENSSLLINKOBJS
+OPENSSLGOSTLINKSRCS
+OPENSSLGOSTLINKOBJS
 DST_OPENSSL_INC
 USE_OPENSSL
 LWRES_PLATFORM_NEEDSYSSELECTH
@@ -13979,12 +13981,16 @@ case "$use_openssl" in
 $as_echo "no" >&6; }
                DST_OPENSSL_INC=""
                USE_OPENSSL=""
+               OPENSSLGOSTLINKOBJS=""
+               OPENSSLGOSTLINKSRS=""
                OPENSSLLINKOBJS=""
                OPENSSLLINKSRCS=""
                ;;
        auto)
                DST_OPENSSL_INC=""
                USE_OPENSSL=""
+               OPENSSLGOSTLINKOBJS=""
+               OPENSSLGOSTLINKSRS=""
                OPENSSLLINKOBJS=""
                OPENSSLLINKSRCS=""
                as_fn_error $? "OpenSSL was not found in any of $openssldirs; use --with-openssl=/path
@@ -14357,11 +14363,13 @@ fi
         esac
         case $have_gost in
         yes)
-                OPENSSL_GOST="yes"
+               OPENSSL_GOST="yes"
+               OPENSSLGOSTLINKOBJS='${OPENSSLGOSTLINKOBJS}'
+               OPENSSLGOSTLINKSRCS='${OPENSSLGOSTLINKSRCS}'
 
 $as_echo "#define HAVE_OPENSSL_GOST 1" >>confdefs.h
 
-                ;;
+               ;;
         *)
                 ;;
         esac
@@ -14385,6 +14393,8 @@ esac
 
 
 
+
+
 DNS_CRYPTO_LIBS="$DNS_CRYPTO_LIBS $DNS_OPENSSL_LIBS"
 
 #

diff --git a/configure.in b/configure.in
index 6e6e25e4903c9b17e004846ca29a196697877c57..f0a3acfe15703f15043974b5652eec9962aa004a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -627,12 +627,16 @@ case "$use_openssl" in
                AC_MSG_RESULT(no)
                DST_OPENSSL_INC=""
                USE_OPENSSL=""
+               OPENSSLGOSTLINKOBJS=""
+               OPENSSLGOSTLINKSRS=""
                OPENSSLLINKOBJS=""
                OPENSSLLINKSRCS=""
                ;;
        auto)
                DST_OPENSSL_INC=""
                USE_OPENSSL=""
+               OPENSSLGOSTLINKOBJS=""
+               OPENSSLGOSTLINKSRS=""
                OPENSSLLINKOBJS=""
                OPENSSLLINKSRCS=""
                AC_MSG_ERROR(
@@ -880,10 +884,12 @@ int main() {
         esac
         case $have_gost in
         yes)
-                OPENSSL_GOST="yes"
-                AC_DEFINE(HAVE_OPENSSL_GOST, 1,
-                          [Define if your OpenSSL version supports GOST.])
-                ;;
+               OPENSSL_GOST="yes"
+               OPENSSLGOSTLINKOBJS='${OPENSSLGOSTLINKOBJS}'
+               OPENSSLGOSTLINKSRCS='${OPENSSLGOSTLINKSRCS}'
+               AC_DEFINE(HAVE_OPENSSL_GOST, 1,
+                         [Define if your OpenSSL version supports GOST.])
+               ;;
         *)
                 ;;
         esac
@@ -902,6 +908,8 @@ esac
 
 AC_SUBST(USE_OPENSSL)
 AC_SUBST(DST_OPENSSL_INC)
+AC_SUBST(OPENSSLGOSTLINKOBJS)
+AC_SUBST(OPENSSLGOSTLINKSRCS)
 AC_SUBST(OPENSSLLINKOBJS)
 AC_SUBST(OPENSSLLINKSRCS)
 AC_SUBST(OPENSSL_ECDSA)

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index a006338864d5cd8162c6d539334ef00e38fcc0f1..ba12e54ad3f74b7e8465b2ac362be53af9903ba2 100644 (file)
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -46,8 +46,9 @@ LIBS =                @LIBS@
 
 # Alphabetically
 
+OPENSSLGOSTLINKOBJS = opensslgost_link.@O@
 OPENSSLLINKOBJS = openssl_link.@O@ openssldh_link.@O@ openssldsa_link.@O@ \
-                 opensslecdsa_link.@O@ opensslgost_link.@O@ \
+                 opensslecdsa_link.@O@ @OPENSSLGOSTLINKOBJS@ \
                  opensslrsa_link.@O@
 
 DSTOBJS =      @DST_EXTRA_OBJS@ @OPENSSLLINKOBJS@ \
@@ -76,8 +77,9 @@ DNSOBJS =     acache.@O@ acl.@O@ adb.@O@ byaddr.@O@ \
 OBJS=          ${DNSOBJS} ${OTHEROBJS} ${DSTOBJS}
 
 # Alphabetically
+OPENSSLGOSTLINKSRCS = opensslgost_link.c
 OPENSSLLINKSRCS = openssl_link.c openssldh_link.c openssldsa_link.c \
-                 opensslecdsa_link.c opensslgost_link.c opensslrsa_link.c
+                 opensslecdsa_link.c @OPENSSLGOSTLINKSRCS@ opensslrsa_link.c
 
 DSTSRCS =      @DST_EXTRA_SRCS@ @OPENSSLLINKSRCS@ \
                dst_api.c dst_lib.c dst_parse.c \

diff --git a/lib/export/dns/Makefile.in b/lib/export/dns/Makefile.in
index 6df36fe8c296ad8ad2c50e427b6a8548cbaec733..076aa2c1a910e1da79beb1119ccb69c9f3344ee1 100644 (file)
--- a/lib/export/dns/Makefile.in
+++ b/lib/export/dns/Makefile.in
@@ -43,8 +43,9 @@ LIBS =                @LIBS@
 
 # Alphabetically
 
+OPENSSLGOSTLINKOBJS = opensslgost_link.@O@
 OPENSSLLINKOBJS = openssl_link.@O@ openssldh_link.@O@ openssldsa_link.@O@ \
-               opensslecdsa_link.@O@ opensslgost_link.@O@ opensslrsa_link.@O@
+               opensslecdsa_link.@O@ @OPENSSLGOSTLINKOBJS@ opensslrsa_link.@O@
 
 DSTOBJS =      @OPENSSLLINKOBJS@ \
                dst_api.@O@ dst_lib.@O@ dst_parse.@O@ dst_result.@O@ \
@@ -71,8 +72,9 @@ OBJS=         ${DNSOBJS} ${OTHEROBJS} ${DSTOBJS} ${PORTDNSOBJS}
 
 # Alphabetically
 
+OPENSSLGOSTLINKSRCS = opensslgost_link.c
 OPENSSLLINKSRCS = openssl_link.c openssldh_link.c openssldsa_link.c \
-               opensslecdsa_link.c opensslgost_link.c opensslrsa_link.c
+               opensslecdsa_link.c @OPENSSLGOSTLINKSRCS@ opensslrsa_link.c
 
 DSTSRCS =      @OPENSSLLINKSRCS@ \
                dst_api.c dst_lib.c dst_parse.c \