summaryrefslogtreecommitdiffstats
path: root/twin
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-04-01 21:50:50 +0000
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-04-01 21:51:38 +0000
commit98f8df6427a933ee405537128e7e913684a6d791 (patch)
tree5aa29ea4230e99ff8a9bb23abe355bed747b9aeb /twin
parent8083ca83aef5f36ccf7e51e6db8f0310b208f929 (diff)
downloadtdebase-98f8df6427a933ee405537128e7e913684a6d791.tar.gz
tdebase-98f8df6427a933ee405537128e7e913684a6d791.zip
Fix compton-tde FTBFS on older systems
Diffstat (limited to 'twin')
-rw-r--r--twin/compton-tde/CMakeLists.txt9
-rw-r--r--twin/compton-tde/common.h5
2 files changed, 11 insertions, 3 deletions
diff --git a/twin/compton-tde/CMakeLists.txt b/twin/compton-tde/CMakeLists.txt
index 65b9c7ed2..7d4f9ace4 100644
--- a/twin/compton-tde/CMakeLists.txt
+++ b/twin/compton-tde/CMakeLists.txt
@@ -13,7 +13,7 @@
if( NOT WITH_XRENDER )
tde_message_fatal( "xrender support is needed to build compton-tde.\n Pass -DWITH_XRENDER=ON to cmake arguments." )
elseif( NOT WITH_XRANDR )
- tde_message_fatal( "xrandr support is needed to build compton-tde.\n Pass -DWITH_XFIXES=ON to cmake arguments." )
+ tde_message_fatal( "xrandr support is needed to build compton-tde.\n Pass -DWITH_XRANDR=ON to cmake arguments." )
elseif( NOT WITH_XFIXES )
tde_message_fatal( "xfixes support is needed to build compton-tde.\n Pass -DWITH_XFIXES=ON to cmake arguments." )
elseif( NOT WITH_XDAMAGE )
@@ -21,11 +21,14 @@ elseif( NOT WITH_XDAMAGE )
elseif( NOT WITH_XEXT )
tde_message_fatal( "xext support is needed to build compton-tde.\n Pass -DWITH_XEXT=ON to cmake arguments." )
elseif( NOT WITH_XINERAMA )
- tde_message_fatal( "xinerama support is needed to build compton-tde.\n Pass -DWITH_XEXT=ON to cmake arguments." )
+ tde_message_fatal( "xinerama support is needed to build compton-tde.\n Pass -DWITH_XINERAMA=ON to cmake arguments." )
+elseif( NOT WITH_LIBCONFIG )
+ tde_message_fatal( "libconfig support is needed to build compton-tde.\n Pass -DWITH_LIBCONFIG=ON to cmake arguments." )
endif( )
include_directories(
+ ${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@@ -68,6 +71,6 @@ endif ()
tde_add_executable( compton-tde
SOURCES c2.c compton.c opengl.c
- LINK m GL config Xinerama ${XRENDER_LIBRARIES} ${XRANDR_LIBRARIES} ${XFIXES_LIBRARIES} ${XDAMAGE_LIBRARIES} ${XEXT_LIBRARIES} ${XCOMPOSITE_LIBRARIES}
+ LINK m GL Xinerama ${LIBCONFIG_LIBRARIES} ${XRENDER_LIBRARIES} ${XRANDR_LIBRARIES} ${XFIXES_LIBRARIES} ${XDAMAGE_LIBRARIES} ${XEXT_LIBRARIES} ${XCOMPOSITE_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/twin/compton-tde/common.h b/twin/compton-tde/common.h
index 275b7b671..5c6392f51 100644
--- a/twin/compton-tde/common.h
+++ b/twin/compton-tde/common.h
@@ -12,6 +12,8 @@
#ifndef COMPTON_COMMON_H
#define COMPTON_COMMON_H
+#include "config.h"
+
// === Options ===
// Debug options, enable them using -D in CFLAGS
@@ -65,6 +67,9 @@
// #define USE_ENV_HOME 1
#define WRITE_PID_FILE 1
#define _TDE_COMP_MGR_VERSION_ 3.00
+#if defined(HAVE_LIBCONFIG_OLD_API)
+#define CONFIG_LIBCONFIG_LEGACY 1
+#endif
#if !defined(CONFIG_C2) && defined(DEBUG_C2)
#error Cannot enable c2 debugging without c2 support.