Move up inclusion of conf.h, so non-MONOLITH programs can benefit from

it as well, especially in apps.c.

diff --git a/apps/apps.h b/apps/apps.h
index 151a94e9195db35bc338a1d6d80e6d376a7258eb..82587b977056c9ef64918c0211ca0c64f9088350 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -66,6 +66,7 @@
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
 #include <openssl/lhash.h>
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
 #include <openssl/lhash.h>

+#include <openssl/conf.h>

 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
 int app_RAND_write_file(const char *file, BIO *bio_e);
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
 int app_RAND_write_file(const char *file, BIO *bio_e);


@@ -99,7 +100,6 @@ extern BIO *bio_err;
 #else
 
 #define MAIN(a,v)      PROG(a,v)
 #else
 
 #define MAIN(a,v)      PROG(a,v)

-#include <openssl/conf.h>

 extern LHASH *config;
 extern char *default_config_file;
 extern BIO *bio_err;
 extern LHASH *config;
 extern char *default_config_file;
 extern BIO *bio_err;