diff -ur dcap-2.47.5.orig/configure.ac dcap-2.47.5/configure.ac --- dcap-2.47.5.orig/configure.ac 2010-10-28 17:20:48.934341000 +0200 +++ dcap-2.47.5/configure.ac 2010-11-06 16:29:48.981553592 +0100 @@ -165,7 +165,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 ]) @@ -231,66 +236,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}" ],[ @@ -300,133 +245,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}" ],[ @@ -436,66 +263,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}" ],[ @@ -505,66 +272,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}" ],[ @@ -649,24 +356,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.5.orig/src/Makefile.am dcap-2.47.5/src/Makefile.am --- dcap-2.47.5.orig/src/Makefile.am 2010-10-22 13:58:19.936738000 +0200 +++ dcap-2.47.5/src/Makefile.am 2010-11-06 16:33:38.934554885 +0100 @@ -133,10 +133,10 @@ 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) print_size.c sigfig.c -dccp_LDFLAGS = -lm +dccp_LDFLAGS = dccp_LDADD = $(LDADDS) libdcap.la dccp_CFLAGS = $(AM_CFLAGS)