From 6870e3c3707c3f5cf5f2d666d67a562cab9ad868 Mon Sep 17 00:00:00 2001
From: Misha <mishakmak@gmail.com>
Date: Thu, 9 Dec 2021 22:51:35 -0500
Subject: [PATCH] Fix build, undo remove config

---
 meson.build       | 17 +++++++++--------
 meson_options.txt |  4 ++--
 pam/meson.build   |  1 +
 pam/pam_fprintd.c |  4 +++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/meson.build b/meson.build
index e11d2dd..ef5fbf7 100644
--- a/meson.build
+++ b/meson.build
@@ -97,6 +97,7 @@ pam_dep = cc.find_library('pam',
     required: get_option('pam'),
     has_headers: 'security/pam_modules.h',
 )
+pthread_dep = dependency('threads')
 
 pod2man = find_program('pod2man', required: get_option('man'))
 xsltproc = find_program('xsltproc', required: get_option('gtk_doc'))
@@ -170,16 +171,16 @@ config_h = configure_file(
   configuration: cdata
 )
 
-subdir('src')
-subdir('data')
-subdir('utils')
+#subdir('src')
+#subdir('data')
+#subdir('utils')
 if get_option('pam')
     subdir('pam')
 endif
-if get_option('gtk_doc')
-    subdir('doc')
-endif
-subdir('tests')
+#if get_option('gtk_doc')
+#    subdir('doc')
+#endif
+#subdir('tests')
 subdir('po')
 
 output = []
@@ -202,6 +203,6 @@ output += '  Manuals: ' + get_option('man').to_string()
 output += '  GTK Doc: ' + get_option('gtk_doc').to_string()
 output += '  XML Linter ' + xmllint.found().to_string()
 output += '\nTest setup:\n'
-output += '  With address sanitizer: ' + address_sanitizer.to_string()
+#output += '  With address sanitizer: ' + address_sanitizer.to_string()
 
 message('\n'+'\n'.join(output)+'\n')
diff --git a/meson_options.txt b/meson_options.txt
index 5daa9a4..226d580 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,11 +5,11 @@ option('pam',
 option('man',
     description: 'Generate the man files',
     type: 'boolean',
-    value: true)
+    value: false)
 option('systemd',
     description: 'Install system service files',
     type: 'boolean',
-    value: true)
+    value: false)
 option('systemd_system_unit_dir',
     description: 'Directory for systemd service files',
     type: 'string')
diff --git a/pam/meson.build b/pam/meson.build
index e95bcde..ef75601 100644
--- a/pam/meson.build
+++ b/pam/meson.build
@@ -16,6 +16,7 @@ pam_fprintd = shared_module('pam_fprintd',
     dependencies: [
         libsystemd_dep,
         pam_dep,
+        pthread_dep,
     ],
     c_args: [
         '-DLOCALEDIR="@0@"'.format(localedir),
diff --git a/pam/pam_fprintd.c b/pam/pam_fprintd.c
index 6bc4946..f0839a1 100644
--- a/pam/pam_fprintd.c
+++ b/pam/pam_fprintd.c
@@ -18,6 +18,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <config.h>
+
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
@@ -781,7 +783,7 @@ do_auth (pam_handle_t *pamh, const char *username)
         release_device (pamh, bus, data->dev);
 
       sd_bus_close (bus);
-      return ret;
+      return *ret;
     }
 
   sd_bus_close (bus);