Selaa lähdekoodia

Remove disconnected zlib code

Bryan Drewery 10 vuotta sitten
vanhempi
commit
be95e62d8c
5 muutettua tiedostoa jossa 1 lisäystä ja 48 poistoa
  1. 1 1
      Makefile.in
  2. 0 3
      build/autotools/configure.ac
  3. 0 29
      build/autotools/includes/acinclude.m4
  4. 0 4
      configure
  5. 0 11
      src/net.cc

+ 1 - 1
Makefile.in

@@ -36,7 +36,7 @@ LD_DEBUG = @CXX@
 STRIP = @STRIP@
 DIFF = @DIFF@
 
-#LIBS = @LIBS@ @ZLIB@
+#LIBS = @LIBS@
 LIBS = @LIBS@
 INCLUDES = @TCL_INCLUDES@ @SSL_INCLUDES@
 

+ 0 - 3
build/autotools/configure.ac

@@ -116,7 +116,6 @@ AC_CHECK_HEADERS([sys/ptrace.h paths.h sys/prctl.h sys/procctl.h])
 AC_CACHE_SAVE
 #AC_CHECK_HEADERS(openssl/ssl.h openssl/crypto.h)
 #AC_CHECK_HEADERS(zlib.h)
-#EGG_CHECK_ZLIB
 CHECK_SSL
 
 # TCL checks
@@ -176,8 +175,6 @@ EGG_TCL_LIB_REQS
 
 AC_CACHE_SAVE
 
-#AC_SUBST(ZLIB)dnl
-
 # Checks for typedefs, structures, and compiler characteristics
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T

+ 0 - 29
build/autotools/includes/acinclude.m4

@@ -506,7 +506,6 @@ AC_DEFUN([EGG_CHECK_LIBS],
 #  AC_CHECK_LIB(nsl, connect)
   AC_CHECK_LIB(dl, dlopen)
 
-#  AC_CHECK_LIB(z, gzopen, ZLIB="-lz")
   if test "$SUNOS" = "yes"; then
     # For suns without yp
     AC_CHECK_LIB(dl, main)
@@ -552,34 +551,6 @@ EOF
 fi
 ])
 
-dnl  EGG_CHECK_ZLIB()
-dnl
-AC_DEFUN([EGG_CHECK_ZLIB], 
-[
-if test "x${ZLIB}" = x; then
-  cat >&2 <<EOF
-configure: error:
-
-  Your system does not provide a working zlib compression library. 
-  It is required.
-
-EOF
-  exit 1
-else
-  if test "${ac_cv_header_zlib_h}" != yes; then
-    cat >&2 <<EOF
-configure: error:
-
-  Your system does not provide the necessary zlib header file. 
-  It is required.
-
-EOF
-    exit 1
-  fi
-fi
-])
-
-
 dnl  CHECK_SSL()
 dnl
 AC_DEFUN([CHECK_SSL],

+ 0 - 4
configure

@@ -4928,7 +4928,6 @@ _ACEOF
 fi
 
 
-#  AC_CHECK_LIB(z, gzopen, ZLIB="-lz")
   if test "$SUNOS" = "yes"; then
     # For suns without yp
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5
@@ -6027,7 +6026,6 @@ fi
 rm -f confcache
 #AC_CHECK_HEADERS(openssl/ssl.h openssl/crypto.h)
 #AC_CHECK_HEADERS(zlib.h)
-#EGG_CHECK_ZLIB
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for path to OpenSSL" >&5
 $as_echo_n "checking for path to OpenSSL... " >&6; }
@@ -6924,8 +6922,6 @@ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
 fi
 rm -f confcache
 
-#AC_SUBST(ZLIB)dnl
-
 # Checks for typedefs, structures, and compiler characteristics
 ac_fn_cxx_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
 if test "x$ac_cv_type_pid_t" = xyes; then :

+ 0 - 11
src/net.cc

@@ -1354,17 +1354,6 @@ void tputs(int z, const char *s, size_t len)
     if (len && socklist[i].encstatus)
       s = link_write(i, s, &len);
 
-#ifdef HAVE_ZLIB_H
-    /*
-       if (socklist[i].gz) {
-       FILE *fp;
-       fp = gzdopen(z, "wb0");
-       x = gzwrite(fp, s, len);
-
-       } else
-       */
-#endif /* HAVE_ZLIB_H */
-
     if (socklist[i].outbuf != NULL) {
       /* Already queueing: just add it */
       *(socklist[i].outbuf) += bd::String(s, len);