httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0 configure.in acinclude.m4 CHANGES
Date Mon, 19 Jul 2004 04:27:14 GMT
jerenkrantz    2004/07/18 21:27:14

  Modified:    .        configure.in acinclude.m4 CHANGES
  Log:
  Workaround RHEL 3 'cuteness' for OpenSSL by calling pkg-config openssl.
  
  For more info, see: http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=82369
  
  Revision  Changes    Path
  1.262     +1 -0      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.261
  retrieving revision 1.262
  diff -u -u -r1.261 -r1.262
  --- configure.in	4 Jun 2004 22:40:46 -0000	1.261
  +++ configure.in	19 Jul 2004 04:27:13 -0000	1.262
  @@ -246,6 +246,7 @@
   dnl ## Check for programs
   
   AC_PATH_PROG(RM, rm)
  +AC_PATH_PROG(PKGCONFIG, pkg-config)
   AC_PROG_AWK
   AC_PROG_INSTALL
   AC_PROG_LN_S
  
  
  
  1.152     +14 -0     httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.151
  retrieving revision 1.152
  diff -u -u -r1.151 -r1.152
  --- acinclude.m4	26 Mar 2004 09:58:34 -0000	1.151
  +++ acinclude.m4	19 Jul 2004 04:27:13 -0000	1.152
  @@ -381,6 +381,13 @@
         ])
         dnl Look for additional, possibly missing headers
         AC_CHECK_HEADERS(openssl/engine.h)
  +      if test -n "$PKGCONFIG"; then
  +        $PKGCONFIG openssl
  +        if test $? -eq 0; then
  +          ap_ssltk_inc="$ap_ssltk_inc `$PKGCONFIG --cflags-only-I openssl`"
  +          CPPFLAGS="$CPPFLAGS $ap_ssltk_inc"
  +        fi
  +      fi
       else
         AC_MSG_RESULT([no OpenSSL headers found])
       fi
  @@ -468,6 +475,13 @@
     # Put SSL libraries in SSL_LIBS.
     if test "$ap_ssltk_type" = "openssl"; then
       APR_SETVAR(SSL_LIBS, [-lssl -lcrypto])
  +    if test -n "$PKGCONFIG"; then
  +      $PKGCONFIG openssl
  +      if test $? -eq 0; then
  +        ap_ssltk_libdep=`$PKGCONFIG --libs openssl`
  +        APR_ADDTO(SSL_LIBS, $ap_ssltk_libdep)
  +      fi
  +    fi
     else
       APR_SETVAR(SSL_LIBS, [-lsslc])
     fi
  
  
  
  1.1539    +2 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1538
  retrieving revision 1.1539
  diff -u -u -r1.1538 -r1.1539
  --- CHANGES	16 Jul 2004 18:40:58 -0000	1.1538
  +++ CHANGES	19 Jul 2004 04:27:13 -0000	1.1539
  @@ -2,6 +2,8 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) mod_ssl: Build on RHEL 3. (RedHat bug: 82369.)  [Justin Erenkrantz]
  +
     *) mod_nw_ssl: Added the directive NWSSLUpgradeable to mod_nw_ssl to 
        allow a non-secure connection to be upgraded to secure connections
        [Brad Nicholes]
  
  
  

Mime
View raw message