Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 24 Jun 2003 23:10:00 -0000
Message-ID: <20030624231000.13315.qmail@icarus.apache.org>
From: wrowe@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/support ab.c

wrowe       2003/06/24 16:10:00

  Modified:    support  ab.c
  Log:
    Absorb our ssl library-foo from the mod_ssl build changes to automatically
    generate an SSL/https: enabled ab binary.
  
  Revision  Changes    Path
  1.123     +24 -15    httpd-2.0/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.c,v
  retrieving revision 1.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- ab.c	3 Feb 2003 17:53:26 -0000	1.122
  +++ ab.c	24 Jun 2003 23:09:59 -0000	1.123
  @@ -185,9 +185,27 @@
   #endif
   #if APR_HAVE_STDLIB_H
   #include <stdlib.h>
  +#endif
  +
  +#if !defined(WIN32) && !defined(NETWARE)
  +#include "ap_config_auto.h"
  +#endif
  +
  +#if defined(HAVE_SSLC)
  +
  +/* Libraries for RSA SSL-C */
  +#include <rsa.h>
  +#include <x509.h>
  +#include <pem.h>
  +#include <err.h>
  +#include <ssl.h>
  +#include <r_rand.h>
  +#include <sslc.h>
  +#define USE_SSL
  +#define RSAREF
  +
  +#elif defined(HAVE_OPENSSL)
   
  -#ifdef	USE_SSL
  -#if ((!(RSAREF)) && (!(SYSSSL)))
   /* Libraries on most systems.. */
   #include <openssl/rsa.h>
   #include <openssl/crypto.h>
  @@ -196,20 +214,11 @@
   #include <openssl/err.h>
   #include <openssl/ssl.h>
   #include <openssl/rand.h>
  -#else
  -/* Libraries for RSAref and SYSSSL */
  -#include <rsa.h>
  -#include <crypto.h>
  -#include <x509.h>
  -#include <pem.h>
  -#include <err.h>
  -#include <ssl.h>
  -#include <rand.h>
  -#endif
  +#define USE_SSL
  +
   #endif
   
   #include <math.h>
  -#endif
   #if APR_HAVE_CTYPE_H
   #include <ctype.h>
   #endif