From 84357741a6a6e6430f199b2c3f7498e0e97da9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Sun, 12 Feb 2023 17:35:53 +0100
Subject: New upstream version 1.2.1

---
 acinclude.m4 | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'acinclude.m4')

diff --git a/acinclude.m4 b/acinclude.m4
index 9393278..df8abe1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -322,10 +322,9 @@ AC_DEFUN([SANE_CHECK_PNG],
 ])
 
 #
-# Checks for pthread support
+# Checks for device locking support
 AC_DEFUN([SANE_CHECK_LOCKING],
 [
-  LOCKPATH_GROUP=uucp
   use_locking=yes
   case "${host_os}" in
     os2* )
@@ -345,23 +344,6 @@ AC_DEFUN([SANE_CHECK_LOCKING],
         use_locking=no
       fi
     ])
-  if test $use_locking = yes ; then
-    AC_ARG_WITH([group],
-      AS_HELP_STRING([--with-group],
-                     [use the specified group for lock dir @<:@default=uucp@:>@]),
-        [LOCKPATH_GROUP="$withval"]
-    )
-    # check if the group does exist
-    lasterror=""
-    touch sanetest.file
-    chgrp $LOCKPATH_GROUP sanetest.file 2>/dev/null || lasterror=$?
-    rm -f sanetest.file
-    if test ! -z "$lasterror"; then
-      AC_MSG_WARN([Group $LOCKPATH_GROUP does not exist on this system.])
-      AC_MSG_WARN([Locking feature will be disabled.])
-      use_locking=no
-    fi
-  fi
   if test $use_locking = yes ; then
     INSTALL_LOCKPATH=install-lockpath
     AC_DEFINE([ENABLE_LOCKING], 1,
@@ -371,11 +353,7 @@ AC_DEFUN([SANE_CHECK_LOCKING],
   fi
   AC_MSG_CHECKING([whether to enable device locking])
   AC_MSG_RESULT([$use_locking])
-  if test $use_locking = yes ; then
-    AC_MSG_NOTICE([Setting lockdir group to $LOCKPATH_GROUP])
-  fi
   AC_SUBST(INSTALL_LOCKPATH)
-  AC_SUBST(LOCKPATH_GROUP)
 ])
 
 dnl
-- 
cgit v1.2.3