From 61f93068e2b74b0d23f7929f51426da29042fd15 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 29 Oct 2011 02:11:45 +0000
Subject: [PATCH] =?UTF-8?q?Fix=20kdenetwork=20FTBFS=20on=20Fedora=2015=20T?=
 =?UTF-8?q?hanks=20to=20Fran=C3=A7ois=20Androit=20for=20the=20patch!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1261216 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kget/CMakeLists.txt          | 2 +-
 kopete/ConfigureChecks.cmake | 8 ++++++++
 krdc/CMakeLists.txt          | 2 +-
 krfb/krfb/CMakeLists.txt     | 2 +-
 wifi/CMakeLists.txt          | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/kget/CMakeLists.txt b/kget/CMakeLists.txt
index 47661f80..95fc2d67 100644
--- a/kget/CMakeLists.txt
+++ b/kget/CMakeLists.txt
@@ -46,6 +46,6 @@ tde_add_executable( kget AUTOMOC
     dlgIndividual.cpp dlgDirectories.cpp dlgConnection.cpp
     dlgAutomation.cpp dlgAdvanced.cpp main.cpp dockindividual.cpp
     kget_iface.skel safedelete.cpp
-  LINK kio-shared
+  LINK kio-shared Xext
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kopete/ConfigureChecks.cmake b/kopete/ConfigureChecks.cmake
index 6a78d91f..aece4366 100644
--- a/kopete/ConfigureChecks.cmake
+++ b/kopete/ConfigureChecks.cmake
@@ -18,3 +18,11 @@ if( (BUILD_KOPETE_PROTOCOL_JABBER AND WITH_JINGLE) OR (BUILD_KOPETE_PROTOCOL_MSN
     tde_message_fatal( "glib-2.0 is required, but was not found on your system" )
   endif( )
 endif( )
+
+# -- Check for libv4l1-videodev.h presence --------------------
+CHECK_INCLUDE_FILE ( "libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H )
+if ( HAVE_LIBV4L1_VIDEODEV_H )
+  add_definitions( -DHAVE_LIBV4L1_VIDEODEV_H )
+endif ( )
+# -- End libv4l1-videodev.h ----------------------------------------------
+
diff --git a/krdc/CMakeLists.txt b/krdc/CMakeLists.txt
index c307684a..5451be71 100644
--- a/krdc/CMakeLists.txt
+++ b/krdc/CMakeLists.txt
@@ -60,6 +60,6 @@ tde_add_executable( krdc AUTOMOC
     maindialogbase.ui keycapturewidget.ui kservicelocator.cpp
     keycapturedialog.cpp kremoteview.cpp smartptr.cpp hostpreferences.cpp
     preferencesdialog.cpp maindialogwidget.cpp maindialog.cpp
-  LINK vnc-static rdp-static kdeui-shared kdnssd-shared kwalletclient-shared
+  LINK vnc-static rdp-static kdeui-shared kdnssd-shared kwalletclient-shared jpeg Xext
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/krfb/krfb/CMakeLists.txt b/krfb/krfb/CMakeLists.txt
index e95276e1..7b49b694 100644
--- a/krfb/krfb/CMakeLists.txt
+++ b/krfb/krfb/CMakeLists.txt
@@ -39,7 +39,7 @@ tde_add_executable( krfb AUTOMOC
     rfbcontroller.cc xupdatescanner.cc main.cpp connectionwidget.ui
     krfbifaceimpl.cc krfbiface.skel trayicon.cpp connectiondialog.cc
   LINK
-    krfbconfig-static vncserver-static srvloc-static kdeui-shared kio-shared ${XTST_LIBRARIES}
+    krfbconfig-static vncserver-static srvloc-static kdeui-shared kio-shared jpeg Xext pthread ${XTST_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/wifi/CMakeLists.txt b/wifi/CMakeLists.txt
index 45fd558b..cddd1dea 100644
--- a/wifi/CMakeLists.txt
+++ b/wifi/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 )
 
 if( WITH_ARTS )
-  set( ARTS_LIBRARIES artsflow;mcop )
+  set( ARTS_LIBRARIES artsflow;artsflow_idl;mcop )
 endif( )