diff -ur dcap-2.47.2.orig/configure.ac dcap-2.47.2/configure.ac
--- dcap-2.47.2.orig/configure.ac	2010-04-07 11:19:38.000000000 +0200
+++ dcap-2.47.2/configure.ac	2010-04-08 09:00:52.558544366 +0200
@@ -53,7 +53,6 @@
 AM_PROG_CC_C_O
 AC_SEARCH_LIBS([gethostbyname], [nsl])
 AC_SEARCH_LIBS([bind], [socket])
-AC_SEARCH_LIBS([adler32], [z])
 AC_CHECK_FUNCS([alarm])
 AC_CHECK_FUNCS([atexit])
 AC_CHECK_FUNCS([bzero])
@@ -124,12 +123,21 @@
 AC_C_BIGENDIAN
 
 
-dnl Store the compile flags prior to testing the presance.
+dnl Store the compile flags prior to testing the presence.
 
 _cppflags="${CPPFLAGS}"
 _ldflags="${LDFLAGS}"
 _ldlibpath="${LD_LIBRARY_PATH}"
 
+dnl === zlib stuff ===
+
+AC_CHECK_LIB(z, adler32, [ZLIB="-lz"])
+AC_SUBST(ZLIB)
+
+CPPFLAGS=${_cppflags}
+LDFLAGS=${_ldflags}
+LD_LIBRARY_PATH=${_ldlibpath}
+
 dnl === openssl stuff ===
 
 nossl=0
@@ -139,7 +147,12 @@
 AC_MSG_RESULT([Disabling ssl plugin as header files not found.])
 else
 AC_CHECK_LIB(ssl,SSL_library_init,[
-SSL_LIBS="-lssl ${SSL_LIBS}"
+SSL_LIBS="-lssl"
+],[
+nossl=1
+])
+AC_CHECK_LIB(crypto,ERR_print_errors_fp,[
+SSL_LIBS="${SSL_LIBS} -lcrypto"
 ],[
 nossl=1
 ])
@@ -188,66 +201,6 @@
 GCC32PTHR_LIBS_NOT=0
 GCC32DBGPTHR_LIBS_NOT=0
 
-AC_CHECK_LIB(globus_common, globus_version_print, [
-GLOBUS_EPEL_LIBS="-lglobus_common ${GLOBUS_EPEL_LIBS}"
-],[
-EPEL_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_proxy_ssl, X509V3_conf_free, [
-GLOBUS_EPEL_LIBS="-lglobus_proxy_ssl ${GLOBUS_EPEL_LIBS}"
-],[
-EPEL_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_oldgaa, internal_error_handler, [
-GLOBUS_EPEL_LIBS="-lglobus_oldgaa ${GLOBUS_EPEL_LIBS}"
-],[
-EPEL_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_openssl_error, globus_module_getenv, [
-GLOBUS_EPEL_LIBS="-lglobus_openssl_error ${GLOBUS_EPEL_LIBS}"
-],[
-EPEL_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_sysconfig, globus_fifo_enqueue, [
-GLOBUS_EPEL_LIBS="-lglobus_gsi_sysconfig ${GLOBUS_EPEL_LIBS}"
-],[
-EPEL_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_openssl, globus_module_activate, [
-GLOBUS_EPEL_LIBS="-lglobus_openssl ${GLOBUS_EPEL_LIBS}"
-],[
-EPEL_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_credential,globus_module_getenv, [
-GLOBUS_EPEL_LIBS="-lglobus_gsi_credential ${GLOBUS_EPEL_LIBS}"
-],[
-EPEL_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_proxy_core,X509_sign, [
-GLOBUS_EPEL_LIBS="-lglobus_gsi_proxy_core ${GLOBUS_EPEL_LIBS}"
-],[
-EPEL_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_cert_utils,X509_get_subject_name, [
-GLOBUS_EPEL_LIBS="-lglobus_gsi_cert_utils ${GLOBUS_EPEL_LIBS}"
-],[
-EPEL_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_callback,X509_get_subject_name, [
-GLOBUS_EPEL_LIBS="-lglobus_gsi_callback ${GLOBUS_EPEL_LIBS}"
-],[
-EPEL_LIBS_NOT=1
-])
-
 AC_CHECK_LIB(globus_gssapi_gsi,gss_wrap, [
 GLOBUS_EPEL_LIBS="-lglobus_gssapi_gsi ${GLOBUS_EPEL_LIBS}"
 ],[
@@ -257,133 +210,15 @@
 
 dnl == 64pthreads libary checking version ==
 
-AC_CHECK_LIB(globus_common_gcc64pthr, globus_version_print, [
-GLOBUS_GCC64PTHR_LIBS="-lglobus_common_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-],[
-GCC64PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_proxy_ssl_gcc64pthr, X509V3_conf_free, [
-GLOBUS_GCC64PTHR_LIBS="-lglobus_proxy_ssl_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-],[
-GCC64PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_oldgaa_gcc64pthr, internal_error_handler, [
-GLOBUS_GCC64PTHR_LIBS="-lglobus_oldgaa_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-],[
-GCC64PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_openssl_error_gcc64pthr, globus_module_getenv, [
-GLOBUS_GCC64PTHR_LIBS="-lglobus_openssl_error_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-],[
-GCC64PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_sysconfig_gcc64pthr, globus_fifo_enqueue, [
-GLOBUS_GCC64PTHR_LIBS="-lglobus_gsi_sysconfig_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-],[
-GCC64PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_openssl_gcc64pthr, globus_module_activate, [
-GLOBUS_GCC64PTHR_LIBS="-lglobus_openssl_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-],[
-GCC64PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_credential_gcc64pthr,globus_module_getenv, [
-GLOBUS_GCC64PTHR_LIBS="-lglobus_gsi_credential_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-],[
-GCC64PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_proxy_core_gcc64pthr,X509_sign, [
-GLOBUS_GCC64PTHR_LIBS="-lglobus_gsi_proxy_core_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-],[
-GCC64PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_cert_utils_gcc64pthr,X509_get_subject_name, [
-GLOBUS_GCC64PTHR_LIBS="-lglobus_gsi_cert_utils_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-],[
-GCC64PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_callback_gcc64pthr,X509_get_subject_name, [
-GLOBUS_GCC64PTHR_LIBS="-lglobus_gsi_callback_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-],[
-GCC64PTHR_LIBS_NOT=1
-])
-
 AC_CHECK_LIB(globus_gssapi_gsi_gcc64pthr,gss_wrap, [
 GLOBUS_GCC64PTHR_LIBS="-lglobus_gssapi_gsi_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
+],[
+GCC64PTHR_LIBS_NOT=1
 ])
 
 
 dnl == 64dbgpthr libary checking version ==
 
-AC_CHECK_LIB(globus_common_gcc64dbgpthr, globus_version_print, [
-GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_common_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-],[
-GCC64DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_proxy_ssl_gcc64dbgpthr, X509V3_conf_free, [
-GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_proxy_ssl_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-],[
-GCC64DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_oldgaa_gcc64dbgpthr, internal_error_handler, [
-GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_oldgaa_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-],[
-GCC64DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_openssl_error_gcc64dbgpthr, globus_module_getenv, [
-GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_openssl_error_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-],[
-GCC64DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_sysconfig_gcc64dbgpthr, globus_fifo_enqueue, [
-GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gsi_sysconfig_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-],[
-GCC64DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_openssl_gcc64dbgpthr, globus_module_activate, [
-GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_openssl_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-],[
-GCC64DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_credential_gcc64dbgpthr,globus_module_getenv, [
-GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gsi_credential_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-],[
-GCC64DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_proxy_core_gcc64dbgpthr,X509_sign, [
-GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gsi_proxy_core_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-],[
-GCC64DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_cert_utils_gcc64dbgpthr,X509_get_subject_name, [
-GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gsi_cert_utils_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-],[
-GCC64DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_callback_gcc64dbgpthr,X509_get_subject_name, [
-GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gsi_callback_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-],[
-GCC64DBGPTHR_LIBS_NOT=1
-])
-
 AC_CHECK_LIB(globus_gssapi_gsi_gcc64dbgpthr,gss_wrap, [
 GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gssapi_gsi_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
 ],[
@@ -393,66 +228,6 @@
 
 dnl == 32pthreads libary checking version ==
 
-AC_CHECK_LIB(globus_common_gcc32pthr, globus_version_print, [
-GLOBUS_GCC32PTHR_LIBS="-lglobus_common_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-],[
-GCC32PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_proxy_ssl_gcc32pthr, X509V3_conf_free, [
-GLOBUS_GCC32PTHR_LIBS="-lglobus_proxy_ssl_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-],[
-GCC32PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_oldgaa_gcc32pthr, internal_error_handler, [
-GLOBUS_GCC32PTHR_LIBS="-lglobus_oldgaa_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-],[
-GCC32PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_openssl_error_gcc32pthr, globus_module_getenv, [
-GLOBUS_GCC32PTHR_LIBS="-lglobus_openssl_error_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-],[
-GCC32PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_sysconfig_gcc32pthr, globus_fifo_enqueue, [
-GLOBUS_GCC32PTHR_LIBS="-lglobus_gsi_sysconfig_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-],[
-GCC32PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_openssl_gcc32pthr, globus_module_activate, [
-GLOBUS_GCC32PTHR_LIBS="-lglobus_openssl_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-],[
-GCC32PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_credential_gcc32pthr,globus_module_getenv, [
-GLOBUS_GCC32PTHR_LIBS="-lglobus_gsi_credential_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-],[
-GCC32PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_proxy_core_gcc32pthr,X509_sign, [
-GLOBUS_GCC32PTHR_LIBS="-lglobus_gsi_proxy_core_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-],[
-GCC32PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_cert_utils_gcc32pthr,X509_get_subject_name, [
-GLOBUS_GCC32PTHR_LIBS="-lglobus_gsi_cert_utils_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-],[
-GCC32PTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_callback_gcc32pthr,X509_get_subject_name, [
-GLOBUS_GCC32PTHR_LIBS="-lglobus_gsi_callback_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-],[
-GCC32PTHR_LIBS_NOT=1
-])
-
 AC_CHECK_LIB(globus_gssapi_gsi_gcc32pthr,gss_wrap, [
 GLOBUS_GCC32PTHR_LIBS="-lglobus_gssapi_gsi_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
 ],[
@@ -462,66 +237,6 @@
 
 dnl == 32dbgpthr libary checking version ==
 
-AC_CHECK_LIB(globus_common_gcc32dbgpthr, globus_version_print, [
-GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_common_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-],[
-GCC32DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_proxy_ssl_gcc32dbgpthr, X509V3_conf_free, [
-GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_proxy_ssl_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-],[
-GCC32DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_oldgaa_gcc32dbgpthr, internal_error_handler, [
-GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_oldgaa_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-],[
-GCC32DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_openssl_error_gcc32dbgpthr, globus_module_getenv, [
-GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_openssl_error_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-],[
-GCC32DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_sysconfig_gcc32dbgpthr, globus_fifo_enqueue, [
-GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gsi_sysconfig_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-],[
-GCC32DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_openssl_gcc32dbgpthr, globus_module_activate, [
-GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_openssl_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-],[
-GCC32DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_credential_gcc32dbgpthr,globus_module_getenv, [
-GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gsi_credential_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-],[
-GCC32DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_proxy_core_gcc32dbgpthr,X509_sign, [
-GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gsi_proxy_core_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-],[
-GCC32DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_cert_utils_gcc32dbgpthr,X509_get_subject_name, [
-GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gsi_cert_utils_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-],[
-GCC32DBGPTHR_LIBS_NOT=1
-])
-
-AC_CHECK_LIB(globus_gsi_callback_gcc32dbgpthr,X509_get_subject_name, [
-GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gsi_callback_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-],[
-GCC32DBGPTHR_LIBS_NOT=1
-])
-
 AC_CHECK_LIB(globus_gssapi_gsi_gcc32dbgpthr,gss_wrap, [
 GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gssapi_gsi_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
 ],[
@@ -606,24 +321,6 @@
 nokrb=1
 ])
 
-AC_CHECK_LIB(crypto,fread, [
-KRB_LIBS="-lcrypto ${KRB_LIBS}"
-],[
-nokrb=1
-])
-
-AC_CHECK_LIB(c,strcmp, [
-KRB_LIBS="-lc ${KRB_LIBS}"
-],[
-nokrb=1
-])
-
-AC_CHECK_LIB(resolv,fopen, [
-KRB_LIBS="-lresolv ${KRB_LIBS}"
-],[
-nokrb=1
-])
-
 fi
 AC_SUBST(KRB_LIBS)
 
diff -ur dcap-2.47.2.orig/src/Makefile.am dcap-2.47.2/src/Makefile.am
--- dcap-2.47.2.orig/src/Makefile.am	2010-04-07 11:19:38.000000000 +0200
+++ dcap-2.47.2/src/Makefile.am	2010-04-08 09:00:52.558544366 +0200
@@ -109,14 +109,14 @@
 lib_LTLIBRARIES = libdcap.la libpdcap.la
 
 libdcap_la_SOURCES = $(c_sources)
-libdcap_la_LIBADD = -lpthread -ldl
+libdcap_la_LIBADD = $(ZLIB) -lpthread -ldl
 libdcap_la_LDFLAGS = -no-undefined -version-info $(LIBRARY_VERSION)
 
 libpdcap_la_SOURCES = $(p_loadsrc) $(c_sources)
-libpdcap_la_LIBADD = -lpthread -ldl
+libpdcap_la_LIBADD = $(ZLIB) -lpthread -ldl
 libpdcap_la_LDFLAGS = -no-undefined -version-info $(LIBRARY_VERSION)
 
-bin_PROGRAMS = dccp dcap_test dcsuck readv_test wdccp dcap_url-test
+bin_PROGRAMS = dccp dcap_test dcsuck readv_test wdccp dcap_url_test
 
 dccp_SOURCES = dccp.c $(h_internal)
 dccp_LDFLAGS =