diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2023-02-12 17:36:29 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2023-02-12 17:36:29 +0100 |
| commit | 882fd010527b8d8823f09e19edbed3746265fa08 (patch) | |
| tree | be5c7cace6697afc753c152d13ad5145d0884a42 /acinclude.m4 | |
| parent | 527bedac30eb120915718eb7997e6dacd583512e (diff) | |
| parent | e0d94cf4d39395df1e2c6bb4d967200298c13881 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 24 |
1 files changed, 1 insertions, 23 deletions
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* ) @@ -346,23 +345,6 @@ AC_DEFUN([SANE_CHECK_LOCKING], 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, [Define to 1 if device locking should be enabled.]) @@ -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 |