Attachment #1156 for bug #1199

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1199
Collapse All | Expand All




# xext (kwin/kompmgr)
if( WITH_XEXT )
  pkg_search_module( XEXT xext )
  if( NOT XEXT_FOUND )
    find_path( XEXT_INCLUDE_DIR  "X11/extensions/Xext.h" )
    if ( NOT XEXT_INCLUDE_DIR )
      tde_message_fatal( "xext is requested, but was not found on your system" )
    endif( )
  endif( )
  set( HAVE_XEXT 1 )
endif( )


# xtest (kxkb)
if( WITH_XTEST )
  pkg_search_module( XTEST xtst )
  if( NOT XTEST_FOUND )
    find_path ( XTEST_INCLUDE_DIR "X11/extensions/XTest.h" )
    if( NOT XTEST_INCLUDE_DIR )
      tde_message_fatal( "xtest is requested, but was not found on your system" )
    endif( )
  endif( )
  set( HAVE_XTEST 1 )
endif( )



  if( HAVE_XSSLIB )
    pkg_search_module( XSS xscrnsaver )
  else( )
    find_path( XSS_LIBRARY_DIR "libXss.so" )
    if( XSS_LIBRARY_DIR )
      set( HAVE_XSSLIB 1 )
    else( )
      check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
      if( HAVE_XSSLIB )
        pkg_search_module( XSS xext )
      endif( )
    endif( )
  endif( )
  find_path( XSCREENSAVER_INCLUDE_DIR "X11/extensions/scrnsaver.h" )
  if( XSCREENSAVER_INCLUDE_DIR )
    set( HAVE_XSCREENSAVER_H 1 )
  endif( )
  if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
    set( HAVE_XSCREENSAVER 1 )
  else( )

Lines 59-68 Link Here

(-)kdebase/kcontrol/ConfigureChecks.cmake.ORI (-4 / +7 lines)
59		59
60	if( WITH_LIBUSB )	60	if( WITH_LIBUSB )
61	pkg_search_module( LIBUSB libusb )	61	pkg_search_module( LIBUSB libusb )
62	if( LIBUSB_FOUND )	62	if( NOT LIBUSB_FOUND )
63	set( HAVE_LIBUSB 1 CACHE INTERNAL "" FORCE )	63	find_path( LIBUSB_LIBRARY_DIR libusb.so )
64	else( )	64	if( LIBUSB_LIBRARY_DIR )
65	tde_message_fatal( "libusb are requested, but not found on your system" )	65	set( HAVE_LIBUSB 1 CACHE INTERNAL "" FORCE )
		66	else( )
		67	#tde_message_fatal( "libusb are requested, but not found on your system" )
		68	endif( )
66	endif( )	69	endif( )
67	endif( )	70	endif( )
68		71

Lines 112-118 Link Here

(-)kdebase/kdm/ConfigureChecks.cmake.ORI (-2 / +2 lines)
112	# Xau	112	# Xau
113	pkg_search_module( XAU xau )	113	pkg_search_module( XAU xau )
114	if( NOT XAU_FOUND )	114	if( NOT XAU_FOUND )
115	tde_message_fatal( "Xau are required, but not found on your system" )	115	set( XAU_LIBRARIES "-lXau" )
116	endif()	116	endif()
117		117
118		118
Lines 122-128 Link Here
122	if( XDMCP_FOUND )	122	if( XDMCP_FOUND )
123	set( XDMCP 1 CACHE INTERNAL "" FORCE )	123	set( XDMCP 1 CACHE INTERNAL "" FORCE )
124	else()	124	else()
125	tde_message_fatal( "xdmcp is requested, but was not found on your system" )	125	set( XDMCP_LIBRARIES "-lXdmcp" )
126	endif()	126	endif()
127	endif()	127	endif()
128		128

Return to bug 1199

Lines 100-121 Link Here

(-)kdebase/ConfigureChecks.cmake.libdetect (-12 / +24 lines)
100	# xext (kwin/kompmgr)	100	# xext (kwin/kompmgr)
101	if( WITH_XEXT )	101	if( WITH_XEXT )
102	pkg_search_module( XEXT xext )	102	pkg_search_module( XEXT xext )
103	if( XEXT_FOUND )	103	if( NOT XEXT_FOUND )
104	set( HAVE_XEXT 1 )	104	find_path( XEXT_INCLUDE_DIR "X11/extensions/Xext.h" )
105	else( XEXT_FOUND )	105	if ( NOT XEXT_INCLUDE_DIR )
106	tde_message_fatal( "xext is requested, but was not found on your system" )	106	tde_message_fatal( "xext is requested, but was not found on your system" )
		107	endif( )
107	endif( )	108	endif( )
		109	set( HAVE_XEXT 1 )
108	endif( )	110	endif( )
109		111
110		112
111	# xtest (kxkb)	113	# xtest (kxkb)
112	if( WITH_XTEST )	114	if( WITH_XTEST )
113	pkg_search_module( XTEST xtst )	115	pkg_search_module( XTEST xtst )
114	if( XTEST_FOUND )	116	if( NOT XTEST_FOUND )
115	set( HAVE_XTEST 1 )	117	find_path ( XTEST_INCLUDE_DIR "X11/extensions/XTest.h" )
116	else( XTEST_FOUND )	118	if( NOT XTEST_INCLUDE_DIR )
117	tde_message_fatal( "xtest is requested, but was not found on your system" )	119	tde_message_fatal( "xtest is requested, but was not found on your system" )
		120	endif( )
118	endif( )	121	endif( )
		122	set( HAVE_XTEST 1 )
119	endif( )	123	endif( )
120		124
121		125
Lines 125-136 Link Here
125	if( HAVE_XSSLIB )	129	if( HAVE_XSSLIB )
126	pkg_search_module( XSS xscrnsaver )	130	pkg_search_module( XSS xscrnsaver )
127	else( )	131	else( )
128	check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )	132	find_path( XSS_LIBRARY_DIR "libXss.so" )
129	if( HAVE_XSSLIB )	133	if( XSS_LIBRARY_DIR )
130	pkg_search_module( XSS xext )	134	set( HAVE_XSSLIB 1 )
		135	else( )
		136	check_library_exists( Xext XScreenSaverQueryInfo "" HAVE_XSSLIB )
		137	if( HAVE_XSSLIB )
		138	pkg_search_module( XSS xext )
		139	endif( )
131	endif( )	140	endif( )
132	endif( )	141	endif( )
133	check_include_file( X11/extensions/scrnsaver.h HAVE_XSCREENSAVER_H )	142	find_path( XSCREENSAVER_INCLUDE_DIR "X11/extensions/scrnsaver.h" )
		143	if( XSCREENSAVER_INCLUDE_DIR )
		144	set( HAVE_XSCREENSAVER_H 1 )
		145	endif( )
134	if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )	146	if( HAVE_XSSLIB AND HAVE_XSCREENSAVER_H )
135	set( HAVE_XSCREENSAVER 1 )	147	set( HAVE_XSCREENSAVER 1 )
136	else( )	148	else( )