Fix minimized builds. Patch by Markus Wanner sent to botan-devel

10 files changed, 31 insertions, 5 deletions

diff --git a/src/cmd/ca.cpp b/src/cmd/ca.cpp
index 17d930358..7dba4c7fe 100644
--- a/src/cmd/ca.cpp
+++ b/src/cmd/ca.cpp
@@ -1,5 +1,5 @@
-
 #include "apps.h"
+#if defined(BOTAN_HAS_X509_CERTIFICATES)
 #include <botan/x509_ca.h>
 using namespace Botan;
 
@@ -61,3 +61,4 @@ int ca_main(int argc, char* argv[])
       }
    return 0;
    }
+#endif
diff --git a/src/cmd/cert_verify.cpp b/src/cmd/cert_verify.cpp
index 154267fe1..daf7240f2 100644
--- a/src/cmd/cert_verify.cpp
+++ b/src/cmd/cert_verify.cpp
@@ -6,6 +6,7 @@
 */
 
 #include "apps.h"
+#if defined(BOTAN_HAS_X509_CERTIFICATES)
 #include <botan/x509cert.h>
 #include <botan/x509path.h>
 #include <iostream>
@@ -41,3 +42,4 @@ int cert_verify_main(int argc, char* argv[])
 
    return 0;
    }
+#endif
diff --git a/src/cmd/main.cpp b/src/cmd/main.cpp
index 5f6a0042f..6e4cb6702 100644
--- a/src/cmd/main.cpp
+++ b/src/cmd/main.cpp
@@ -37,7 +37,7 @@ int help(int , char* argv[])
    return 1;
    }
 
-int config_main(int argc, char* argv[])
+int config_main(int , char* argv[])
    {
    return 1;
    }
@@ -109,20 +109,24 @@ int main(int argc, char* argv[])
       CALL_APP(base64);
       CALL_APP(bcrypt);
       CALL_APP(bzip);
-      CALL_APP(ca);
       CALL_APP(factor);
       CALL_APP(fpe);
       CALL_APP(hash);
       CALL_APP(keygen);
       CALL_APP(dsa_sign);
       CALL_APP(dsa_verify);
-      CALL_APP(pkcs10);
       CALL_APP(read_ssh);
-      CALL_APP(self_sig);
+#if defined(BOTAN_HAS_TLS)
       CALL_APP(tls_client);
       CALL_APP(tls_server);
       CALL_APP(tls_server_asio);
+#endif
+#if defined(BOTAN_HAS_X509_CERTIFICATES)
+      CALL_APP(ca);
+      CALL_APP(pkcs10);
+      CALL_APP(self_sig);
       CALL_APP(x509);
+#endif
       CALL_APP(speed);
 
       std::cout << "Unknown command " << cmd << "\n";
diff --git a/src/cmd/ocsp.cpp b/src/cmd/ocsp.cpp
index 98324caff..a36dd73f6 100644
--- a/src/cmd/ocsp.cpp
+++ b/src/cmd/ocsp.cpp
@@ -1,4 +1,5 @@
 #include "apps.h"
+#if defined(BOTAN_HAS_X509_CERTIFICATES)
 #include <botan/x509cert.h>
 #include <botan/certstor.h>
 #include <botan/x509path.h>
@@ -36,3 +37,4 @@ int ocsp_check_main(int argc, char* argv[])
       return 1;
       }
    }
+#endif
diff --git a/src/cmd/pkcs10.cpp b/src/cmd/pkcs10.cpp
index cb1d44436..2dad14575 100644
--- a/src/cmd/pkcs10.cpp
+++ b/src/cmd/pkcs10.cpp
@@ -1,4 +1,5 @@
 #include "apps.h"
+#if defined(BOTAN_HAS_X509_CERTIFICATES)
 #include <botan/x509self.h>
 #include <botan/rsa.h>
 #include <botan/dsa.h>
@@ -46,3 +47,4 @@ int pkcs10_main(int argc, char* argv[])
       }
    return 0;
    }
+#endif
diff --git a/src/cmd/self_sig.cpp b/src/cmd/self_sig.cpp
index 7d05aed60..592a7f279 100644
--- a/src/cmd/self_sig.cpp
+++ b/src/cmd/self_sig.cpp
@@ -1,4 +1,5 @@
 #include "apps.h"
+#if defined(BOTAN_HAS_X509_CERTIFICATES)
 #include <botan/x509self.h>
 #include <botan/rsa.h>
 #include <botan/dsa.h>
@@ -68,3 +69,4 @@ int self_sig_main(int argc, char* argv[])
 
    return 0;
    }
+#endif
diff --git a/src/cmd/tls_client.cpp b/src/cmd/tls_client.cpp
index 933d859eb..0c92d2cba 100644
--- a/src/cmd/tls_client.cpp
+++ b/src/cmd/tls_client.cpp
@@ -1,4 +1,6 @@
 #include "apps.h"
+
+#if defined(BOTAN_HAS_TLS)
 #include <botan/tls_client.h>
 #include <botan/pkcs8.h>
 #include <botan/hex.h>
@@ -261,3 +263,5 @@ int tls_client_main(int argc, char* argv[])
       }
    return 0;
    }
+
+#endif
diff --git a/src/cmd/tls_server.cpp b/src/cmd/tls_server.cpp
index dac69e2c1..396497727 100644
--- a/src/cmd/tls_server.cpp
+++ b/src/cmd/tls_server.cpp
@@ -1,4 +1,6 @@
 #include "apps.h"
+
+#if defined(BOTAN_HAS_TLS)
 #include <botan/tls_server.h>
 #include <botan/hex.h>
 
@@ -260,3 +262,5 @@ int tls_server_main(int argc, char* argv[])
 
    return 0;
    }
+
+#endif
diff --git a/src/cmd/tls_server_asio.cpp b/src/cmd/tls_server_asio.cpp
index f04e479ac..0e5af3dcc 100644
--- a/src/cmd/tls_server_asio.cpp
+++ b/src/cmd/tls_server_asio.cpp
@@ -1,4 +1,6 @@
 #include "apps.h"
+
+#if defined(BOTAN_HAS_TLS)
 #include <iostream>
 #include <string>
 #include <vector>
@@ -313,3 +315,4 @@ int tls_server_asio_main(int argc, char* argv[])
    return 0;
    }
 
+#endif
diff --git a/src/cmd/x509print.cpp b/src/cmd/x509print.cpp
index 935b50668..c2c63021c 100644
--- a/src/cmd/x509print.cpp
+++ b/src/cmd/x509print.cpp
@@ -1,4 +1,5 @@
 #include "apps.h"
+#if defined(BOTAN_HAS_X509_CERTIFICATES)
 #include <botan/x509cert.h>
 
 int x509_main(int argc, char* argv[])
@@ -15,3 +16,4 @@ int x509_main(int argc, char* argv[])
 
    return 0;
    }
+#endif