From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 3 Mar 2013 09:00:18 +0000 (+0100)
Subject: changes to avoid compilation of programs that cannot be.
X-Git-Tag: gnutls_3_1_10~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aefd9b8c35205e28f09445f1c47cdb494e6fbdbe;p=thirdparty%2Fgnutls.git

changes to avoid compilation of programs that cannot be.
---

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index c7573878cc..d23f464cd8 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -87,7 +87,7 @@ check_bits (gnutls_session_t session, gnutls_x509_crt_t crt, unsigned int max_bi
 
 /* three days */
 #define MAX_OCSP_VALIDITY_SECS (3*60*60*24)
-
+#ifdef ENABLE_OCSP
 /* If the certificate is revoked status will be GNUTLS_CERT_REVOKED.
  * 
  * Returns:
@@ -198,6 +198,7 @@ cleanup:
   return ret;
 }
 
+#endif
 
 #define CLEAR_CERTS for(x=0;x<peer_certificate_list_size;x++) { \
 	if (peer_certificate_list[x]) \
@@ -321,12 +322,14 @@ _gnutls_x509_cert_verify_peers (gnutls_session_t session,
         }
     }
 
+#ifdef ENABLE_OCSP
   ret = check_ocsp_response(session, peer_certificate_list[0], issuer, &resp, &ocsp_status);
   if (ret < 0)
     {
       CLEAR_CERTS;
       return gnutls_assert_val(ret);
     }
+#endif
 
 skip_ocsp:
   /* Verify certificate 
diff --git a/src/Makefile.am b/src/Makefile.am
index 2794a1f654..87686111a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,12 +39,16 @@ AM_CPPFLAGS = \
 	-I$(srcdir)/../extra/includes	\
 	$(LIBOPTS_CFLAGS)
 
-bin_PROGRAMS = gnutls-serv gnutls-cli psktool gnutls-cli-debug certtool
+bin_PROGRAMS = psktool gnutls-cli-debug certtool
 if ENABLE_SRP
 bin_PROGRAMS += srptool
 endif
+
 if ENABLE_OCSP
-bin_PROGRAMS += ocsptool
+bin_PROGRAMS += ocsptool gnutls-serv 
+if ENABLE_ANON
+bin_PROGRAMS += gnutls-cli
+endif
 endif
 
 bin_PROGRAMS += danetool
@@ -59,19 +63,6 @@ endif
 
 noinst_LTLIBRARIES =
 
-gnutls_serv_SOURCES =		\
-  list.h serv.c			\
-  udp-serv.c udp-serv.h		\
-  socket.c socket.h		\
-  common.h common.c		\
-  certtool-common.h 
-gnutls_serv_LDADD = ../lib/libgnutls.la
-gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la
-gnutls_serv_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
-gnutls_serv_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB)
-noinst_LTLIBRARIES += libcmd-serv.la
-libcmd_serv_la_CFLAGS =
-libcmd_serv_la_SOURCES = serv-args.def serv-args.c serv-args.h
 
 if ENABLE_SRP
 srptool_SOURCES = srptool.c
@@ -82,7 +73,16 @@ libcmd_srp_la_CFLAGS =
 libcmd_srp_la_SOURCES = srptool-args.def srptool-args.c srptool-args.h
 endif
 
+psktool_SOURCES = psk.c
+psktool_LDADD = ../lib/libgnutls.la libcmd-psk.la ../gl/libgnu.la 
+psktool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
+noinst_LTLIBRARIES += libcmd-psk.la
+libcmd_psk_la_CFLAGS = 
+libcmd_psk_la_SOURCES = psk-args.def psk-args.c psk-args.h
+
+
 if ENABLE_OCSP
+
 ocsptool_SOURCES = ocsptool.c ocsptool-common.h ocsptool-common.c \
 	socket.c socket.h
 ocsptool_LDADD = ../lib/libgnutls.la libcmd-ocsp.la ../gl/libgnu.la 
@@ -90,14 +90,22 @@ ocsptool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) $(GETADDRINFO_LIB)
 noinst_LTLIBRARIES += libcmd-ocsp.la
 libcmd_ocsp_la_CFLAGS =
 libcmd_ocsp_la_SOURCES = ocsptool-args.def ocsptool-args.h ocsptool-args.c
-endif
 
-psktool_SOURCES = psk.c
-psktool_LDADD = ../lib/libgnutls.la libcmd-psk.la ../gl/libgnu.la 
-psktool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
-noinst_LTLIBRARIES += libcmd-psk.la
-libcmd_psk_la_CFLAGS = 
-libcmd_psk_la_SOURCES = psk-args.def psk-args.c psk-args.h
+gnutls_serv_SOURCES =		\
+  list.h serv.c			\
+  udp-serv.c udp-serv.h		\
+  socket.c socket.h		\
+  common.h common.c		\
+  certtool-common.h 
+gnutls_serv_LDADD = ../lib/libgnutls.la
+gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la
+gnutls_serv_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL)
+gnutls_serv_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB)
+noinst_LTLIBRARIES += libcmd-serv.la
+libcmd_serv_la_CFLAGS =
+libcmd_serv_la_SOURCES = serv-args.def serv-args.c serv-args.h
+
+if ENABLE_ANON
 
 BENCHMARK_SRCS = benchmark-cipher.c benchmark.c benchmark.h benchmark-tls.c
 
@@ -114,6 +122,8 @@ gnutls_cli_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) $(LIB_CLOCK_GETTIME) \
 noinst_LTLIBRARIES += libcmd-cli.la
 libcmd_cli_la_CFLAGS = 
 libcmd_cli_la_SOURCES = cli-args.def cli-args.c cli-args.h
+endif
+endif
 
 gnutls_cli_debug_SOURCES = cli-debug.c tests.h tests.c \
 		socket.c socket.h common.h common.c