Adding Meson Option switching pam to bsd_auth.h ! (#16)

* should adding bsd_auth.h instead pam * Adding Meson options to build bsd_auth.c instead of pam * remove git diff; enhance pam.. * remove changement dialog * fixes #if issues * remove comments * Fix indent, remove useless & empty lines * Fix indentation and unnecessary changes in meson.build * Cosmetic changes to src/meson.build * Revert single change to indentation in src/meson.build --------- Co-authored-by: Bilal Emohmadian <[email protected]> Co-authored-by: Campbell Jones <[email protected]>
BuddiesOfBudgie · Feb 15, 2023 · dcf496d · dcf496d
1 parent e54d7e7
commit dcf496d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/meson.build b/meson.build
@@ -42,7 +42,13 @@ if with_xf86gamma_ext
 endif
 
 c = meson.get_compiler('c')
-dep_pam = c.find_library('pam', required: true)
+
+with_bsd_auth = get_option('with-bsd_auth')
+
+if with_bsd_auth == false
+    # BSDs don't have linux PAM
+    dep_pam = c.find_library('pam', required: true)
+endif
 
 # Inspired by https://github.com/GNOME/recipes/blob/master/meson.build
 package_version = meson.project_version()

diff --git a/meson_options.txt b/meson_options.txt
@@ -1,4 +1,5 @@
 option('with-systemd', type: 'boolean', value: true, description: 'Enable systemd integration')
+option('with-bsd_auth', type: 'boolean', value: false, description: 'Use BSD Auth instead of PAM')
 option('without-kbd-layout-indicator', type: 'boolean', value: false, description: 'Disable keyboard layout indicator')
 option('with-console-kit', type: 'boolean', value: true, description: 'Enable ConsoleKit support')
 option('with-xf86gamma-ext', type: 'boolean', value: true, description: 'Enable support for XFree86 gamma fading')

diff --git a/src/meson.build b/src/meson.build
@@ -9,13 +9,18 @@ screensaver_command_sources = [
 
 screensaver_dialog_sources = [
     'gnome-screensaver-dialog.c',
-    'gs-auth-pam.c',
     'gs-lock-plug.c',
     'gs-debug.c',
     'setuid.c',
     'subprocs.c',
 ]
 
+if with_bsd_auth == false
+    screensaver_dialog_sources += 'gs-auth-pam.c'
+else
+    screensaver_dialog_sources += 'gs-auth-bsdauth.c'
+endif
+
 screensaver_sources = [
     'gnome-screensaver.c',
 	'gs-monitor.c',
@@ -34,7 +39,11 @@ screensaver_sources = [
 
 screensaver_command_deps = [dep_glib, dep_gio]
 
-screensaver_dialog_deps = [dep_pam, dep_gthread, dep_gtk3, dep_gnomedesktop]
+screensaver_dialog_deps = [dep_gthread, dep_gtk3, dep_gnomedesktop]
+
+if with_bsd_auth == false
+    screensaver_dialog_deps += dep_pam
+endif
 
 screensaver_deps = [dep_x11, dep_gtk3, dep_dbus, dep_gnomedesktop, dep_gsettings]