[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.18.2.3 1.18.2.4

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmcurl
In directory public:/mounts/ram/cvs-serv13106/Utilities/cmcurl

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in RC 5


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/CMakeLists.txt,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -C 2 -d -r1.18.2.3 -r1.18.2.4
*** CMakeLists.txt	6 Nov 2008 15:54:36 -0000	1.18.2.3
--- CMakeLists.txt	2 Dec 2008 12:08:40 -0000	1.18.2.4
***************
*** 154,158 ****
  
  # Check for all needed libraries
! CHECK_LIBRARY_EXISTS_CONCAT("dl"     dlopen       HAVE_LIBDL)
  #CHECK_LIBRARY_EXISTS_CONCAT("ucb"    gethostname  HAVE_LIBUCB)
  CHECK_LIBRARY_EXISTS_CONCAT("socket" connect      HAVE_LIBSOCKET)
--- 154,161 ----
  
  # Check for all needed libraries
! # use the cmake defined dl libs as dl is should not be used
! # on HPUX, but rather dld this avoids a warning
! SET(CURL_LIBS ${CURL_LIBS} ${CMAKE_DL_LIBS})
! #CHECK_LIBRARY_EXISTS_CONCAT("dl"     dlopen       HAVE_LIBDL)
  #CHECK_LIBRARY_EXISTS_CONCAT("ucb"    gethostname  HAVE_LIBUCB)
  CHECK_LIBRARY_EXISTS_CONCAT("socket" connect      HAVE_LIBSOCKET)