OSSP CVS Repository

ossp - Check-in [3080]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 3080
Date: 2003-Jan-20 16:34:13 (local)
2003-Jan-20 15:34:13 (UTC)
User:mlelstv
Branch:
Comment: make external references optional
Tickets:
Inspections:
Files:
ossp-pkg/sio/configure.ac      1.3 -> 1.4     3 inserted, 3 deleted
ossp-pkg/sio/sio.ac      added-> 1.1
ossp-pkg/sio/sio_bio.c      1.9 -> 1.10     7 inserted, 0 deleted
ossp-pkg/sio/sio_test.c      1.6 -> 1.7     9 inserted, 0 deleted
ossp-pkg/sio/sio_zlib.c      1.5 -> 1.6     7 inserted, 0 deleted
ossp-pkg/sio/configure.ac 1.3 -> 1.4 

--- configure.ac 2003/01/06 19:04:56     1.3
+++ configure.ac 2003/01/20 15:34:13     1.4
@@ -41,9 +41,9 @@
 sinclude(libtool.m4)
 AC_PROG_LIBTOOL
 
-dnl ## local checks go here (not yet)
-dnl sinclude(sio.ac)
-dnl SIO_CHECK_ALL
+dnl ## local checks go here
+sinclude(sio.ac)
+SIO_CHECK_ALL
 
 AC_CHECK_EXTLIB([OSSP ex], ex, __ex_ctx, ex.h,
                 [AC_DEFINE(WITH_EX, 1, [Define to 1 if building with OSSP ex])])

ossp-pkg/sio/sio.ac -> 1.1 

*** /dev/null    Sat Nov 23 00:54:35 2024
--- -    Sat Nov 23 00:54:45 2024
***************
*** 0 ****
--- 1,66 ----
+ dnl ##
+ dnl ##  OSSP sio - Stream I/O
+ dnl ##  Copyright (c) 2002 Ralf S. Engelschall <rse@engelschall.com>
+ dnl ##  Copyright (c) 2002 The OSSP Project <http://www.ossp.org/>
+ dnl ##  Copyright (c) 2002 Cable & Wireless Deutschland <http://www.cw.com/de/>
+ dnl ##  Copyright (c) 2002 Michael van Elst <mlelstv@dev.de.cw.net>
+ dnl ##
+ dnl ##  This file is part of OSSP sio, an abstract data type of
+ dnl ##  a pair of half-duplex data pipes which can be found at
+ dnl ##  http://www.ossp.org/pkg/lib/sio/.
+ dnl ##
+ dnl ##  Permission to use, copy, modify, and distribute this software for
+ dnl ##  any purpose with or without fee is hereby granted, provided that
+ dnl ##  the above copyright notice and this permission notice appear in all
+ dnl ##  copies.
+ dnl ##
+ dnl ##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ dnl ##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ dnl ##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ dnl ##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+ dnl ##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ dnl ##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ dnl ##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ dnl ##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ dnl ##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ dnl ##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ dnl ##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ dnl ##  SUCH DAMAGE.
+ dnl ##
+ dnl ##  sio.ac: OSSP sio Autoconf checks
+ dnl ##
+ 
+ dnl #   Check for anything OSSP sio wants to know
+ dnl #   configure.in:
+ dnl #     SIO_CHECK_ALL
+ 
+ AC_DEFUN(SIO_CHECK_ALL,[
+ 
+ dnl #   built-time configuration parameter --enable-bio
+ AC_MSG_CHECKING(for BIO support)
+ AC_ARG_ENABLE(bio,dnl
+ [  --enable-bio             enable BIO support (default=no)],
+ [ enable_bio=$enableval ],
+ [ enable_bio=no ]
+ )dnl
+ AC_MSG_RESULT([$enable_bio])
+ if test ".$enable_bio" = .yes; then
+ AC_CHECK_LIB(crypto, CRYPTO_free)
+ AC_CHECK_LIB(ssl, SSL_alert_desc_string)
+ AC_DEFINE(ENABLE_BIO, 1, [Define to 1 if building with BIO (openssl)])
+ fi
+ 
+ dnl #   built-time configuration parameter --enable-zlib
+ AC_MSG_CHECKING(for ZLIB support)
+ AC_ARG_ENABLE(zlib,dnl
+ [  --enable-zlib            enable ZLIB support (default=no)],
+ [ enable_zlib=$enableval ],
+ [ enable_zlib=no ]
+ )dnl
+ AC_MSG_RESULT([$enable_zlib])
+ if test ".$enable_zlib" = .yes; then
+ AC_CHECK_LIB(z, inflate)
+ AC_DEFINE(ENABLE_ZLIB, 1, [Define to 1 if building with ZLIB])
+ fi
+ 
+ ])

ossp-pkg/sio/sio_bio.c 1.9 -> 1.10 

--- sio_bio.c    2003/01/06 19:04:56     1.9
+++ sio_bio.c    2003/01/20 15:34:13     1.10
@@ -28,6 +28,12 @@
 **  sio_bio.c: OpenSSL BIO stage
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if ENABLE_BIO
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -623,3 +629,4 @@
     siobio_shutdown
 };
 
+#endif /* ENABLE_BIO */

ossp-pkg/sio/sio_test.c 1.6 -> 1.7 

--- sio_test.c   2003/01/06 19:04:56     1.6
+++ sio_test.c   2003/01/20 15:34:13     1.7
@@ -28,12 +28,21 @@
 **  sio_test.c: test suite
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef ENABLE_BIO
+#error Test requires BIO + SSL
+#endif
+
 #include <stdio.h>
 
 #include "al.h"
 #include "sio.h"
 
 #include "sa.h"
+
 #include <openssl/ssl.h>
 #include <openssl/bio.h>
 extern BIO_METHOD *BIO_s_socket();

ossp-pkg/sio/sio_zlib.c 1.5 -> 1.6 

--- sio_zlib.c   2003/01/06 19:04:56     1.5
+++ sio_zlib.c   2003/01/20 15:34:13     1.6
@@ -28,6 +28,12 @@
 **  sio_zlib.c: zlib compression stage
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if ENABLE_ZLIB
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -364,3 +370,4 @@
     NULL
 };
 
+#endif /* ENABLE_ZLIB */

CVSTrac 2.0.1