summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <francois.andriot@free.fr>2014-10-18 14:07:17 +0200
committerSlávek Banko <slavek.banko@axis.cz>2014-10-18 14:29:19 +0200
commit1651fcb54a3690cb973fdadbda8e8130da1e351c (patch)
tree454cd15408294494a11b2e67a1357a7effee8923
parent71fb8e0e115daa047a514df546d13d294f376840 (diff)
downloadtdebase-1651fcb54a3690cb973fdadbda8e8130da1e351c.tar.gz
tdebase-1651fcb54a3690cb973fdadbda8e8130da1e351c.zip
Fix conditionnal utmpx support in tdm
Signed-off-by: François Andriot <francois.andriot@free.fr>"
-rw-r--r--tdm/ConfigureChecks.cmake2
-rw-r--r--tdm/kfrontend/kgreeter.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/tdm/ConfigureChecks.cmake b/tdm/ConfigureChecks.cmake
index 162a8a6ba..cb333aa61 100644
--- a/tdm/ConfigureChecks.cmake
+++ b/tdm/ConfigureChecks.cmake
@@ -85,7 +85,7 @@ unset( BSD_UTMP )
if( NOT HAVE_UTMPX )
check_function_exists( getutent have_getutent )
if( NOT have_getutent )
- set( BSD_UTMP 1 )
+ set( BSD_UTMP 1 CACHE INTERNAL "" FORCE )
endif( )
endif( )
diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp
index 5ff8d5516..cb38599c1 100644
--- a/tdm/kfrontend/kgreeter.cpp
+++ b/tdm/kfrontend/kgreeter.cpp
@@ -71,7 +71,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <fcntl.h>
#include <sys/types.h>
#include <utmp.h>
+#ifdef HAVE_UTMPX
#include <utmpx.h>
+#endif
#include <stdio.h>
#include <string.h>