kopia lustrzana https://gitlab.com/sane-project/backends
The Locking feature will now be disabled, when the selected group
could not be set. The configuration script should not fail any longer.merge-requests/1/head
Gerhard Jaeger
rodzic
5c9ba87bb1
commit
3757078c34
|
|
@ -295,7 +295,10 @@ AC_DEFUN([SANE_CHECK_LOCKING],
|
|||
chgrp $LOCKPATH_GROUP sanetest.file || lasterror=$?
|
||||
rm -f sanetest.file
|
||||
if test ! -z $lasterror; then
|
||||
AC_MSG_ERROR([Group $LOCKPATH_GROUP not exist on this system, either create it or use an existing.])
|
||||
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
|
||||
else
|
||||
INSTALL_LOCKPATH=
|
||||
|
|
|
|||
|
|
@ -6194,9 +6194,12 @@ fi;
|
|||
chgrp $LOCKPATH_GROUP sanetest.file || lasterror=$?
|
||||
rm -f sanetest.file
|
||||
if test ! -z $lasterror; then
|
||||
{ { echo "$as_me:$LINENO: error: Group $LOCKPATH_GROUP not exist on this system, either create it or use an existing." >&5
|
||||
echo "$as_me: error: Group $LOCKPATH_GROUP not exist on this system, either create it or use an existing." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
{ echo "$as_me:$LINENO: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&5
|
||||
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
|
||||
else
|
||||
INSTALL_LOCKPATH=
|
||||
|
|
@ -10613,7 +10616,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 10616 "configure"' > conftest.$ac_ext
|
||||
echo '#line 10619 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -11852,7 +11855,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:11855:" \
|
||||
echo "$as_me:11858:" \
|
||||
"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
|
||||
|
|
@ -12913,11 +12916,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:12916: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12919: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:12920: \$? = $ac_status" >&5
|
||||
echo "$as_me:12923: \$? = $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
|
||||
|
|
@ -13156,11 +13159,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:13159: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13162: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13163: \$? = $ac_status" >&5
|
||||
echo "$as_me:13166: \$? = $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
|
||||
|
|
@ -13216,11 +13219,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:13219: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13222: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13223: \$? = $ac_status" >&5
|
||||
echo "$as_me:13226: \$? = $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
|
||||
|
|
@ -15401,7 +15404,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15404 "configure"
|
||||
#line 15407 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -15499,7 +15502,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15502 "configure"
|
||||
#line 15505 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -17696,11 +17699,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:17699: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17702: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17703: \$? = $ac_status" >&5
|
||||
echo "$as_me:17706: \$? = $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
|
||||
|
|
@ -17756,11 +17759,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:17759: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17762: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:17763: \$? = $ac_status" >&5
|
||||
echo "$as_me:17766: \$? = $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
|
||||
|
|
@ -19117,7 +19120,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19120 "configure"
|
||||
#line 19123 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -19215,7 +19218,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19218 "configure"
|
||||
#line 19221 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -20052,11 +20055,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:20055: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:20058: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:20059: \$? = $ac_status" >&5
|
||||
echo "$as_me:20062: \$? = $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
|
||||
|
|
@ -20112,11 +20115,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:20115: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:20118: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:20119: \$? = $ac_status" >&5
|
||||
echo "$as_me:20122: \$? = $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
|
||||
|
|
@ -22151,11 +22154,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:22154: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:22157: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:22158: \$? = $ac_status" >&5
|
||||
echo "$as_me:22161: \$? = $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
|
||||
|
|
@ -22394,11 +22397,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:22397: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:22400: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:22401: \$? = $ac_status" >&5
|
||||
echo "$as_me:22404: \$? = $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
|
||||
|
|
@ -22454,11 +22457,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:22457: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:22460: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:22461: \$? = $ac_status" >&5
|
||||
echo "$as_me:22464: \$? = $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
|
||||
|
|
@ -24639,7 +24642,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 24642 "configure"
|
||||
#line 24645 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -24737,7 +24740,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 24740 "configure"
|
||||
#line 24743 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -27170,7 +27173,7 @@ echo "Documentation: `eval eval echo ${docdir}`"
|
|||
if eval "test x$INSTALL_LOCKPATH = xinstall-lockpath" ; then
|
||||
echo "Lockfiles: `eval eval echo ${localstatedir}/lock/sane`"
|
||||
else
|
||||
echo "Lockfiles:"
|
||||
echo "Lockfiles: Feature is disabled!"
|
||||
fi
|
||||
echo "-> Network parameters:"
|
||||
if test "${SANED}" = "saned" ; then
|
||||
|
|
|
|||
|
|
@ -488,7 +488,7 @@ echo "Documentation: `eval eval echo ${docdir}`"
|
|||
if eval "test x$INSTALL_LOCKPATH = xinstall-lockpath" ; then
|
||||
echo "Lockfiles: `eval eval echo ${localstatedir}/lock/sane`"
|
||||
else
|
||||
echo "Lockfiles:"
|
||||
echo "Lockfiles: Feature is disabled!"
|
||||
fi
|
||||
echo "-> Network parameters:"
|
||||
if test "${SANED}" = "saned" ; then
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue