Attachment 2826 Details for Bug 2841 – tdelibs - cmake: find utempter helper

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.

[patch] tdelibs - cmake: find utempter helper

tdelibs-cmake-find-utempter-helper.diff (text/plain), 2.19 KB, created by Slávek Banko on 2018-02-03 13:52:35 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2018-02-03 13:52:35 CST

Size: 2.19 KB

patch

obsolete

>Index: b/CMakeLists.txt
>===================================================================
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -595,7 +595,26 @@
> if( WITH_UTEMPTER )
>   check_include_file( utempter.h HAVE_UTEMPTER_H )
>   check_library_exists( utempter addToUtmp "" HAVE_ADDTOUTEMP )
>-  if( HAVE_UTEMPTER_H AND HAVE_ADDTOUTEMP )
>+  if( NOT DEFINED UTEMPTER_HELPER )
>+    message( STATUS "Looking for utempter helper" )
>+    find_program( UTEMPTER_HELPER utempter
>+      PATHS
>+        /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/utempter
>+        /usr/lib/utempter
>+        /usr/libexec/utempter
>+        /usr/libexec
>+        /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}/utempter
>+        /usr/local/lib/utempter
>+        /usr/local/libexec/utempter
>+        /usr/local/libexec
>+    )
>+    if( UTEMPTER_HELPER )
>+      message( STATUS "Looking for utempter helper - found" )
>+    else( )
>+      message( STATUS "Looking for utempter helper - not found" )
>+    endif( )
>+  endif( )
>+  if( HAVE_UTEMPTER_H AND HAVE_ADDTOUTEMP AND NOT UTEMPTER_HELPER-NOTFOUND )
>     set( HAVE_UTEMPTER 1 )
>     set( UTEMPTER_LIBRARY utempter )
>   else( )
>Index: b/config.h.cmake
>===================================================================
>--- a/config.h.cmake
>+++ b/config.h.cmake
>@@ -708,6 +708,7 @@
> 
> /* Define if you have the utempter helper for utmp managment */
> #cmakedefine HAVE_UTEMPTER 1
>+#cmakedefine UTEMPTER_HELPER "@UTEMPTER_HELPER@"
> 
> /* Define to 1 if you have the <util.h> header file. */
> #cmakedefine HAVE_UTIL_H 1
>Index: b/tdecore/kpty.cpp
>===================================================================
>--- a/tdecore/kpty.cpp
>+++ b/tdecore/kpty.cpp
>@@ -453,7 +453,7 @@
> #ifdef HAVE_UTEMPTER
>     TDEProcess_Utmp utmp;
>     utmp.cmdFd = d->masterFd;
>-    utmp << "/usr/lib/utempter/utempter" << "add";
>+    utmp << UTEMPTER_HELPER << "add";
>     if (remotehost)
>       utmp << remotehost;
>     utmp.start(TDEProcess::Block);
>@@ -498,7 +498,7 @@
> #ifdef HAVE_UTEMPTER
>     TDEProcess_Utmp utmp;
>     utmp.cmdFd = d->masterFd;
>-    utmp << "/usr/lib/utempter/utempter" << "del";
>+    utmp << UTEMPTER_HELPER << "del";
>     utmp.start(TDEProcess::Block);
> #elif defined(USE_LOGIN)
>     const char *str_ptr = d->ttyName.data();

Actions: View | Diff

Attachments on bug 2841: 2826