kcontrol: move HAS_RANDR_1_2 configuration definition to config-X11 header

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

config-X11.h.cmake

@@ -1,6 +1,12 @@
 /* Define if you have the XRandR extension */
 #cmakedefine HAVE_XRANDR 1
 
+/* Define if you have XRandR 1.2 */
+#cmakedefine HAS_RANDR_1_2 1
+
+/* Define if you have XRandR 1.3 */
+#cmakedefine HAS_RANDR_1_3 1
+
 /* Define if you have the XDamage extension */
 #cmakedefine HAVE_XDAMAGE 1
 
@@ -34,9 +40,6 @@
 /* Define if you have the XSync extension */
 #cmakedefine HAVE_XSYNC 1
 
-/* Define if you have XRandR 1.3 */
-#cmakedefine HAS_RANDR_1_3 1
-
 /* Define if you have the XRes extension */
 #cmakedefine HAVE_XRES 1
 

kcontrol/randr/CMakeLists.txt

@@ -3,12 +3,7 @@ if( XRANDR_1_2_FOUND )
     add_subdirectory(module)
 endif( XRANDR_1_2_FOUND )
 
-configure_file(
-    config-randr.h.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/config-randr.h
-)
-
-include_directories( ${X11_Xrandr_INCLUDE_PATH}  )
+include_directories( ${X11_Xrandr_INCLUDE_PATH} )
 
 ########### next target ###############
 

kcontrol/randr/config-randr.h.cmake

@@ -1,2 +0,0 @@
-#cmakedefine HAS_RANDR_1_2 1
-#cmakedefine HAS_RANDR_1_3 1

kcontrol/randr/krandrapp.cpp

@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 
-#include <config-randr.h>
+#include <config-X11.h>
 #include "krandrapp.h"
 #include "moc_krandrapp.cpp"
 

kcontrol/randr/krandrmodule.cpp

@@ -19,16 +19,16 @@
 
 #include "krandrmodule.h"
 #include "legacyrandrconfig.h"
-#include <QTextStream>
 #include "legacyrandrscreen.h"
 #include "randrdisplay.h"
 #include "randrconfig.h"
 
+#include <QTextStream>
 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <KDebug>
 #include <KApplication>
-#include <config-randr.h>
+#include <config-X11.h>
 
 #include "randr.h"
 

kcontrol/randr/krandrtray.cpp

@@ -17,6 +17,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <config-X11.h>
+
 #include "krandrtray.h"
 #include "krandrpassivepopup.h"
 #include "moc_krandrtray.cpp"
@@ -27,8 +29,6 @@
 #include "randrmode.h"
 #endif
 
-#include <config-randr.h>
-
 #include <QtGui/qevent.h>
 #include <QVariant>
 

kcontrol/randr/randr.h

@@ -21,11 +21,13 @@
 #ifndef __RANDR_H__
 #define __RANDR_H__
 
+#include <config-X11.h>
+
 #include <KDebug>
 #include <KLocale>
 #include <QString>
 #include <QPixmap>
-#include <config-randr.h>
+
 #include "ktimerdialog.h"
 
 extern "C"

kcontrol/randr/randrdisplay.cpp

@@ -18,6 +18,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <config-X11.h>
+
 #include <KLocale>
 #include <KConfigGroup>
 #include <KDebug>
@@ -30,7 +32,6 @@
 #include "randrscreen.h"
 #endif
 #include "legacyrandrscreen.h"
-#include <config-randr.h>
 
 RandRDisplay::RandRDisplay()
 	: m_valid(true)