[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2009-05-24 13:36:10
Message-ID: 1243172170.214418.3413.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 972268 by ossi:

link libnsl on solaris (once again)

BUG: 191929

this should fix detection of getifaddrs as well and thus make this ugly
hack unnecessary:
BUG: 191861

 M  +10 -1     ConfigureChecks.cmake  
 M  +2 -1      backend/CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/kdm/ConfigureChecks.cmake #972267:972268
@@ -73,6 +73,12 @@
 define_library(socket connect)
 define_library(resolv dn_expand)
 
+# for Solaris
+check_function_exists(gethostbyname have_gethostbyname)
+if (NOT have_gethostbyname)
+	define_library(nsl gethostbyname)
+endif (NOT have_gethostbyname)
+
 # for genkdmconf; this is TODO
 #if (EXISTS /etc/ttys)
 #	set(BSD_INIT 1)
@@ -171,7 +177,10 @@
 option(KDE4_KDM_XCONSOLE "Build KDM with built-in xconsole" OFF)
 macro_bool_to_01(KDE4_KDM_XCONSOLE WITH_KDM_XCONSOLE)
 
-check_function_exists(getifaddrs  HAVE_GETIFADDRS)
+macro_push_required_vars()
+set(CMAKE_REQUIRED_LIBRARIES ${NSL_LIBRARIES})
+check_function_exists(getifaddrs HAVE_GETIFADDRS)
+macro_pop_required_vars()
 check_function_exists(getloadavg  HAVE_GETLOADAVG)
 check_function_exists(setproctitle HAVE_SETPROCTITLE)
 check_function_exists(strnlen     HAVE_STRNLEN)
--- trunk/KDE/kdebase/workspace/kdm/backend/CMakeLists.txt #972267:972268
@@ -57,8 +57,9 @@
 	${S_LIBRARIES}
 	${KRB4_LIBRARIES}
 	${KRB5_LIBRARIES}
+	${NSL_LIBRARIES}
+	${RESOLV_LIBRARIES}
 	${SOCKET_LIBRARIES}
-	${RESOLV_LIBRARIES}
 )
 if (CKCONNECTOR_FOUND)
 	include_directories(${CKCONNECTOR_INCLUDE_DIR} ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})
[prev in list] [next in list] [prev in thread] [next in thread]