kopia lustrzana https://gitlab.com/sane-project/backends
Fix disabling of locking when locking group does not exist
Mattias Ellert
rodzic
ee26d224ec
commit
007bd9e9f6
|
|
@ -1,3 +1,8 @@
|
|||
2005-09-07 Mattias Ellert <mattias.ellert@tsl.uu.se>
|
||||
|
||||
* acinclude.m4, configure: fix disabling of locking when the
|
||||
locking user group does not exist
|
||||
|
||||
2005-09-07 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||
|
||||
* doc/descriptions/unsupported.desc: Added Genius ColorPage Slim
|
||||
|
|
|
|||
|
|
@ -286,9 +286,6 @@ AC_DEFUN([SANE_CHECK_LOCKING],
|
|||
fi
|
||||
])
|
||||
if test $use_locking = yes ; then
|
||||
AC_DEFINE([ENABLE_LOCKING], 1,
|
||||
[Define to 1 if device locking should be enabled.])
|
||||
INSTALL_LOCKPATH=install-lockpath
|
||||
AC_ARG_WITH([group],
|
||||
AC_HELP_STRING([--with-group],
|
||||
[use the specified group for lock dir @<:@default=uucp@:>@]),
|
||||
|
|
@ -303,8 +300,12 @@ AC_DEFUN([SANE_CHECK_LOCKING],
|
|||
AC_MSG_WARN([Group $LOCKPATH_GROUP does not exist on this system.])
|
||||
AC_MSG_WARN([Locking feature will be disabled.])
|
||||
use_locking=no
|
||||
INSTALL_LOCKPATH=
|
||||
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.])
|
||||
else
|
||||
INSTALL_LOCKPATH=
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -6347,12 +6347,6 @@ if test "${enable_locking+set}" = set; then
|
|||
fi;
|
||||
if test $use_locking = yes ; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define ENABLE_LOCKING 1
|
||||
_ACEOF
|
||||
|
||||
INSTALL_LOCKPATH=install-lockpath
|
||||
|
||||
# Check whether --with-group or --without-group was given.
|
||||
if test "${with_group+set}" = set; then
|
||||
withval="$with_group"
|
||||
|
|
@ -6370,8 +6364,15 @@ echo "$as_me: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&2
|
|||
{ echo "$as_me:$LINENO: WARNING: Locking feature will be disabled." >&5
|
||||
echo "$as_me: WARNING: Locking feature will be disabled." >&2;}
|
||||
use_locking=no
|
||||
INSTALL_LOCKPATH=
|
||||
fi
|
||||
fi
|
||||
if test $use_locking = yes ; then
|
||||
INSTALL_LOCKPATH=install-lockpath
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define ENABLE_LOCKING 1
|
||||
_ACEOF
|
||||
|
||||
else
|
||||
INSTALL_LOCKPATH=
|
||||
fi
|
||||
|
|
@ -10921,7 +10922,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 10924 "configure"' > conftest.$ac_ext
|
||||
echo '#line 10925 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -12160,7 +12161,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:12163:" \
|
||||
echo "$as_me:12164:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
|
|
@ -13258,11 +13259,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13261: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13262: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13265: \$? = $ac_status" >&5
|
||||
echo "$as_me:13266: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -13520,11 +13521,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13523: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13524: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13527: \$? = $ac_status" >&5
|
||||
echo "$as_me:13528: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -13582,11 +13583,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13585: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13586: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13589: \$? = $ac_status" >&5
|
||||
echo "$as_me:13590: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -15822,7 +15823,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15825 "configure"
|
||||
#line 15826 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -15920,7 +15921,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15923 "configure"
|
||||
#line 15924 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -18168,11 +18169,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18171: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18172: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:18175: \$? = $ac_status" >&5
|
||||
echo "$as_me:18176: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -18230,11 +18231,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18233: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18234: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:18237: \$? = $ac_status" >&5
|
||||
echo "$as_me:18238: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -19599,7 +19600,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19602 "configure"
|
||||
#line 19603 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -19697,7 +19698,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19700 "configure"
|
||||
#line 19701 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -20582,11 +20583,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:20585: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:20586: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:20589: \$? = $ac_status" >&5
|
||||
echo "$as_me:20590: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -20644,11 +20645,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:20647: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:20648: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:20651: \$? = $ac_status" >&5
|
||||
echo "$as_me:20652: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -22766,11 +22767,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:22769: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:22770: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:22773: \$? = $ac_status" >&5
|
||||
echo "$as_me:22774: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -23028,11 +23029,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:23031: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:23032: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:23035: \$? = $ac_status" >&5
|
||||
echo "$as_me:23036: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -23090,11 +23091,11 @@ else
|
|||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:23093: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:23094: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:23097: \$? = $ac_status" >&5
|
||||
echo "$as_me:23098: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -25330,7 +25331,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 25333 "configure"
|
||||
#line 25334 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -25428,7 +25429,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 25431 "configure"
|
||||
#line 25432 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue