Revert "Merge pull request #679 from bbockelm/xrootd-tpc-rename"

This reverts commit e3550ce, reversing
changes made to a768fd6.

It has been decided that this PR is to be reverted as it does not follow
XRootD coding conventions and brakes the build on vanilla RHEL6 platform
in presence of libcurl-devel package. There should be a check in the
CMake infrastructures that ensures the XrdTpc package will be only built
if a proper version of libcurl-devel is present (or XrdTpc should built
with version of libcurl-devel provided in raw RHEL6 environment).
Moreover the new component should be packaged properly (if neccessary
a _with_tpchttp macro should be tested in the spec file).

cmake/XRootDFindLibs.cmake

@@ -27,9 +27,6 @@ if( SYSTEMD_FOUND )
   add_definitions( -DHAVE_SYSTEMD )
 endif()
 
-include (FindPkgConfig)
-pkg_check_modules(CURL libcurl)
-
 if( ENABLE_CRYPTO )
   find_package( OpenSSL )
   if( OPENSSL_FOUND )
@@ -73,14 +70,8 @@ endif()
 if( ENABLE_HTTP )
   if( OPENSSL_FOUND AND BUILD_CRYPTO )
     set( BUILD_HTTP TRUE )
-    if( CURL_FOUND )
-      set( BUILD_TPC TRUE )
-    else()
-      set( BUILD_TPC FALSE )
-    endif()
   else()
     set( BUILD_HTTP FALSE )
-    set( BUILD_TPC FALSE )
   endif()
 endif()
 

src/CMakeLists.txt

@@ -38,7 +38,6 @@ include( XrdFileCache )
 
 if( BUILD_HTTP )
   include( XrdHttp )
-  include( XrdTpc )
 endif()
 
 if( BUILD_CEPH )

src/XrdHttp.cmake

@@ -15,11 +15,9 @@ if( BUILD_HTTP )
   #-----------------------------------------------------------------------------
   include_directories( ${OPENSSL_INCLUDE_DIR} )
 
-  # Note this is marked as a shared library as XrdHttp plugins are expected to
-  # link against this for the XrdHttpExt class implementations.
   add_library(
     ${LIB_XRD_HTTP}
-    SHARED
+    MODULE
     XrdHttp/XrdHttpProtocol.cc    XrdHttp/XrdHttpProtocol.hh
     XrdHttp/XrdHttpReq.cc         XrdHttp/XrdHttpReq.hh
                                   XrdHttp/XrdHttpSecXtractor.hh
@@ -42,7 +40,6 @@ if( BUILD_HTTP )
     ${LIB_XRD_HTTP}
     PROPERTIES
     INTERFACE_LINK_LIBRARIES ""
-    SUFFIX ".so"
     LINK_INTERFACE_LIBRARIES "" )
 
   #-----------------------------------------------------------------------------