kopia lustrzana https://gitlab.com/sane-project/backends
Only define union semun if not already defined in <sys/sem.h>. Fixes
compilation bugs on Irix and FreeBSD. Henning Meier-Geinitz <henning@meier-geinitz.de>DEVEL_2_0_BRANCH-1
Henning Geinitz
rodzic
a5d9d86a31
commit
5a1ea1bcd2
|
|
@ -55,8 +55,8 @@
|
|||
|
||||
#include "snapscan-usb.h"
|
||||
|
||||
/* the following code is taken from the manpage of semctl(2) */
|
||||
#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
|
||||
/* check for union semun */
|
||||
#if defined(HAVE_UNION_SEMUN)
|
||||
/* union semun is defined by including <sys/sem.h> */
|
||||
#else
|
||||
/* according to X/OPEN we have to define it ourselves */
|
||||
|
|
@ -447,6 +447,11 @@ static SANE_Status usb_request_sense(SnapScan_Scanner *pss) {
|
|||
|
||||
/*
|
||||
* $Log$
|
||||
* Revision 1.7 2002/01/27 18:24:47 hmg
|
||||
* Only define union semun if not already defined in <sys/sem.h>. Fixes
|
||||
* compilation bugs on Irix and FreeBSD.
|
||||
* Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||
*
|
||||
* Revision 1.6 2002/01/15 20:16:55 oliverschwartz
|
||||
* Added workaround for bug in semctl() on PPC; backend version 1.4.5
|
||||
*
|
||||
|
|
|
|||
|
|
@ -2206,7 +2206,7 @@ else
|
|||
fi
|
||||
rm -f conftest*
|
||||
|
||||
|
||||
|
||||
if test "$ac_cv_header_sys_scsiio_h" = "yes" \
|
||||
-a "$ac_cv_header_scsi_h" = "yes";
|
||||
then
|
||||
|
|
@ -2261,20 +2261,48 @@ EOF
|
|||
fi
|
||||
rm -f conftest*
|
||||
|
||||
echo $ac_n "checking for union semun in <sys/sem.h>""... $ac_c" 1>&6
|
||||
echo "configure:2266: checking for union semun in <sys/sem.h>" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2268 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sys/sem.h>
|
||||
|
||||
int main() {
|
||||
union semun test_semun
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
echo "$ac_t""yes" 1>&6;
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_UNION_SEMUN 1
|
||||
EOF
|
||||
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
|
||||
|
||||
ac_safe=`echo "linux/videodev.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for linux/videodev.h""... $ac_c" 1>&6
|
||||
echo "configure:2268: checking for linux/videodev.h" >&5
|
||||
echo "configure:2296: checking for linux/videodev.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2273 "configure"
|
||||
#line 2301 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <linux/videodev.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -2298,12 +2326,12 @@ fi
|
|||
if test "${ac_cv_header_linux_videodev_h}" = "yes"
|
||||
then
|
||||
echo $ac_n "checking Video4Linux version 1 or 2""... $ac_c" 1>&6
|
||||
echo "configure:2302: checking Video4Linux version 1 or 2" >&5
|
||||
echo "configure:2330: checking Video4Linux version 1 or 2" >&5
|
||||
if eval "test \"`echo '$''{'sane_v4l_version'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2307 "configure"
|
||||
#line 2335 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <linux/videodev.h>
|
||||
#ifdef V4L2_MAJOR_VERSION
|
||||
|
|
@ -2333,17 +2361,17 @@ if test "${enable_dynamic}" != "no"; then
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:2337: checking for $ac_hdr" >&5
|
||||
echo "configure:2365: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2342 "configure"
|
||||
#line 2370 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -2364,7 +2392,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|||
#define $ac_tr_hdr 1
|
||||
EOF
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:2368: checking for dlopen in -ldl" >&5
|
||||
echo "configure:2396: checking for dlopen in -ldl" >&5
|
||||
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2372,7 +2400,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2376 "configure"
|
||||
#line 2404 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2383,7 +2411,7 @@ int main() {
|
|||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2408,12 +2436,12 @@ fi
|
|||
for ac_func in dlopen
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:2412: checking for $ac_func" >&5
|
||||
echo "configure:2440: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2417 "configure"
|
||||
#line 2445 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -2436,7 +2464,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
|
|
@ -2473,17 +2501,17 @@ done
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:2477: checking for $ac_hdr" >&5
|
||||
echo "configure:2505: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2482 "configure"
|
||||
#line 2510 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -2504,7 +2532,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|||
#define $ac_tr_hdr 1
|
||||
EOF
|
||||
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
|
||||
echo "configure:2508: checking for shl_load in -ldld" >&5
|
||||
echo "configure:2536: checking for shl_load in -ldld" >&5
|
||||
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2512,7 +2540,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldld $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2516 "configure"
|
||||
#line 2544 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2523,7 +2551,7 @@ int main() {
|
|||
shl_load()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2548,12 +2576,12 @@ fi
|
|||
for ac_func in shl_load
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:2552: checking for $ac_func" >&5
|
||||
echo "configure:2580: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2557 "configure"
|
||||
#line 2585 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -2576,7 +2604,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
|
|
@ -2611,7 +2639,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
|
||||
echo "configure:2615: checking for sqrt in -lm" >&5
|
||||
echo "configure:2643: checking for sqrt in -lm" >&5
|
||||
ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2619,7 +2647,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2623 "configure"
|
||||
#line 2651 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2630,7 +2658,7 @@ int main() {
|
|||
sqrt()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2658,7 +2686,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for scsireq_enter in -lscsi""... $ac_c" 1>&6
|
||||
echo "configure:2662: checking for scsireq_enter in -lscsi" >&5
|
||||
echo "configure:2690: checking for scsireq_enter in -lscsi" >&5
|
||||
ac_lib_var=`echo scsi'_'scsireq_enter | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2666,7 +2694,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lscsi $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2670 "configure"
|
||||
#line 2698 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2677,7 +2705,7 @@ int main() {
|
|||
scsireq_enter()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2705,7 +2733,7 @@ else
|
|||
fi
|
||||
# FreeBSD needs this
|
||||
echo $ac_n "checking for cam_open_device in -lcam""... $ac_c" 1>&6
|
||||
echo "configure:2709: checking for cam_open_device in -lcam" >&5
|
||||
echo "configure:2737: checking for cam_open_device in -lcam" >&5
|
||||
ac_lib_var=`echo cam'_'cam_open_device | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2713,7 +2741,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lcam $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2717 "configure"
|
||||
#line 2745 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2724,7 +2752,7 @@ int main() {
|
|||
cam_open_device()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2752,7 +2780,7 @@ else
|
|||
fi
|
||||
# FreeBSD 3+ needs this
|
||||
echo $ac_n "checking for usb_open in -lusb""... $ac_c" 1>&6
|
||||
echo "configure:2756: checking for usb_open in -lusb" >&5
|
||||
echo "configure:2784: checking for usb_open in -lusb" >&5
|
||||
ac_lib_var=`echo usb'_'usb_open | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2760,7 +2788,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lusb $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2764 "configure"
|
||||
#line 2792 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2771,7 +2799,7 @@ int main() {
|
|||
usb_open()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2801,7 +2829,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for jpeg_start_decompress in -ljpeg""... $ac_c" 1>&6
|
||||
echo "configure:2805: checking for jpeg_start_decompress in -ljpeg" >&5
|
||||
echo "configure:2833: checking for jpeg_start_decompress in -ljpeg" >&5
|
||||
ac_lib_var=`echo jpeg'_'jpeg_start_decompress | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2809,7 +2837,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2813 "configure"
|
||||
#line 2841 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2820,7 +2848,7 @@ int main() {
|
|||
jpeg_start_decompress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2838,17 +2866,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|||
|
||||
ac_safe=`echo "jconfig.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for jconfig.h""... $ac_c" 1>&6
|
||||
echo "configure:2842: checking for jconfig.h" >&5
|
||||
echo "configure:2870: checking for jconfig.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2847 "configure"
|
||||
#line 2875 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <jconfig.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -2866,9 +2894,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|||
echo "$ac_t""yes" 1>&6
|
||||
|
||||
echo $ac_n "checking for jpeglib - version >= 61 (6a)""... $ac_c" 1>&6
|
||||
echo "configure:2870: checking for jpeglib - version >= 61 (6a)" >&5
|
||||
echo "configure:2898: checking for jpeglib - version >= 61 (6a)" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2872 "configure"
|
||||
#line 2900 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <jpeglib.h>
|
||||
|
|
@ -2918,7 +2946,7 @@ if test "${with_gphoto2+set}" = set; then
|
|||
# Extract the first word of "${ac_tool_prefix}gphoto2-config", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}gphoto2-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2922: checking for $ac_word" >&5
|
||||
echo "configure:2950: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_HAVE_GPHOTO2'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2950,7 +2978,7 @@ if test -n "$ac_tool_prefix"; then
|
|||
# Extract the first word of "gphoto2-config", so it can be a program name with args.
|
||||
set dummy gphoto2-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:2954: checking for $ac_word" >&5
|
||||
echo "configure:2982: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_HAVE_GPHOTO2'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3022,7 +3050,7 @@ fi
|
|||
|
||||
if test "`uname`" != "IRIX" -a "`uname`" != "IRIX64"; then
|
||||
echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
|
||||
echo "configure:3026: checking for gethostbyaddr in -lnsl" >&5
|
||||
echo "configure:3054: checking for gethostbyaddr in -lnsl" >&5
|
||||
ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3030,7 +3058,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lnsl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3034 "configure"
|
||||
#line 3062 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3041,7 +3069,7 @@ int main() {
|
|||
gethostbyaddr()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3069,7 +3097,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
|
||||
echo "configure:3073: checking for socket in -lsocket" >&5
|
||||
echo "configure:3101: checking for socket in -lsocket" >&5
|
||||
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3077,7 +3105,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3081 "configure"
|
||||
#line 3109 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3088,7 +3116,7 @@ int main() {
|
|||
socket()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3116,7 +3144,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for syslog in -lsyslog""... $ac_c" 1>&6
|
||||
echo "configure:3120: checking for syslog in -lsyslog" >&5
|
||||
echo "configure:3148: checking for syslog in -lsyslog" >&5
|
||||
ac_lib_var=`echo syslog'_'syslog | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3124,7 +3152,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsyslog $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3128 "configure"
|
||||
#line 3156 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3135,7 +3163,7 @@ int main() {
|
|||
syslog()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3188,17 +3216,17 @@ fi
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:3192: checking for $ac_hdr" >&5
|
||||
echo "configure:3220: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3197 "configure"
|
||||
#line 3225 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:3202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:3230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -3219,7 +3247,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|||
#define $ac_tr_hdr 1
|
||||
EOF
|
||||
echo $ac_n "checking for ptalInit in -lptal""... $ac_c" 1>&6
|
||||
echo "configure:3223: checking for ptalInit in -lptal" >&5
|
||||
echo "configure:3251: checking for ptalInit in -lptal" >&5
|
||||
ac_lib_var=`echo ptal'_'ptalInit | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3227,7 +3255,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lptal $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3231 "configure"
|
||||
#line 3259 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3238,7 +3266,7 @@ int main() {
|
|||
ptalInit()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3290,19 +3318,19 @@ fi
|
|||
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
|
||||
# for constant arguments. Useless!
|
||||
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
|
||||
echo "configure:3294: checking for working alloca.h" >&5
|
||||
echo "configure:3322: checking for working alloca.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3299 "configure"
|
||||
#line 3327 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <alloca.h>
|
||||
int main() {
|
||||
char *p = alloca(2 * sizeof(int));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_header_alloca_h=yes
|
||||
else
|
||||
|
|
@ -3323,12 +3351,12 @@ EOF
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for alloca""... $ac_c" 1>&6
|
||||
echo "configure:3327: checking for alloca" >&5
|
||||
echo "configure:3355: checking for alloca" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3332 "configure"
|
||||
#line 3360 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
|
@ -3356,7 +3384,7 @@ int main() {
|
|||
char *p = (char *) alloca(1);
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_cv_func_alloca_works=yes
|
||||
else
|
||||
|
|
@ -3388,12 +3416,12 @@ EOF
|
|||
|
||||
|
||||
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
|
||||
echo "configure:3392: checking whether alloca needs Cray hooks" >&5
|
||||
echo "configure:3420: checking whether alloca needs Cray hooks" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3397 "configure"
|
||||
#line 3425 "configure"
|
||||
#include "confdefs.h"
|
||||
#if defined(CRAY) && ! defined(CRAY2)
|
||||
webecray
|
||||
|
|
@ -3418,12 +3446,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
|
|||
if test $ac_cv_os_cray = yes; then
|
||||
for ac_func in _getb67 GETB67 getb67; do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:3422: checking for $ac_func" >&5
|
||||
echo "configure:3450: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3427 "configure"
|
||||
#line 3455 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -3446,7 +3474,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
|
|
@ -3473,7 +3501,7 @@ done
|
|||
fi
|
||||
|
||||
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
|
||||
echo "configure:3477: checking stack direction for C alloca" >&5
|
||||
echo "configure:3505: checking stack direction for C alloca" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3481,7 +3509,7 @@ else
|
|||
ac_cv_c_stack_direction=0
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3485 "configure"
|
||||
#line 3513 "configure"
|
||||
#include "confdefs.h"
|
||||
find_stack_direction ()
|
||||
{
|
||||
|
|
@ -3500,7 +3528,7 @@ main ()
|
|||
exit (find_stack_direction() < 0);
|
||||
}
|
||||
EOF
|
||||
if { (eval echo configure:3504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_c_stack_direction=1
|
||||
else
|
||||
|
|
@ -3521,21 +3549,21 @@ EOF
|
|||
|
||||
fi
|
||||
|
||||
for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
|
||||
for ac_hdr in unistd.h
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:3529: checking for $ac_hdr" >&5
|
||||
echo "configure:3557: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3534 "configure"
|
||||
#line 3562 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:3539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:3567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -3564,12 +3592,12 @@ done
|
|||
for ac_func in getpagesize
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:3568: checking for $ac_func" >&5
|
||||
echo "configure:3596: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3573 "configure"
|
||||
#line 3601 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -3592,7 +3620,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
|
|
@ -3617,7 +3645,7 @@ fi
|
|||
done
|
||||
|
||||
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
|
||||
echo "configure:3621: checking for working mmap" >&5
|
||||
echo "configure:3649: checking for working mmap" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3625,7 +3653,7 @@ else
|
|||
ac_cv_func_mmap_fixed_mapped=no
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3629 "configure"
|
||||
#line 3657 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
/* Thanks to Mike Haertel and Jim Avera for this test.
|
||||
|
|
@ -3653,24 +3681,11 @@ else
|
|||
#include <fcntl.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
#if HAVE_SYS_TYPES_H
|
||||
# include <sys/types.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_STDLIB_H
|
||||
# include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_SYS_STAT_H
|
||||
# include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
#if HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
/* This mess was copied from the GNU getpagesize.h. */
|
||||
#ifndef HAVE_GETPAGESIZE
|
||||
# ifdef HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
# endif
|
||||
|
||||
/* Assume that all systems that can run configure have sys/param.h. */
|
||||
# ifndef HAVE_SYS_PARAM_H
|
||||
|
|
@ -3778,7 +3793,7 @@ main()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:3782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
ac_cv_func_mmap_fixed_mapped=yes
|
||||
else
|
||||
|
|
@ -3806,12 +3821,12 @@ for ac_func in atexit ioperm mkdir scsireq_enter sigprocmask \
|
|||
getenv isfdtype vsyslog inet_ntop
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:3810: checking for $ac_func" >&5
|
||||
echo "configure:3825: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3815 "configure"
|
||||
#line 3830 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -3834,7 +3849,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
|
|
@ -3860,7 +3875,7 @@ done
|
|||
|
||||
|
||||
echo $ac_n "checking linker parameter to set runtime link path""... $ac_c" 1>&6
|
||||
echo "configure:3864: checking linker parameter to set runtime link path" >&5
|
||||
echo "configure:3879: checking linker parameter to set runtime link path" >&5
|
||||
if eval "test \"`echo '$''{'LINKER_RPATH'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3953,7 +3968,7 @@ fi
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:3957: checking for $ac_word" >&5
|
||||
echo "configure:3972: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -3981,7 +3996,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
|
||||
echo "configure:3985: checking for BSD-compatible nm" >&5
|
||||
echo "configure:4000: checking for BSD-compatible nm" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4017,7 +4032,7 @@ NM="$ac_cv_path_NM"
|
|||
echo "$ac_t""$NM" 1>&6
|
||||
|
||||
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
||||
echo "configure:4021: checking whether ln -s works" >&5
|
||||
echo "configure:4036: checking whether ln -s works" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4071,8 +4086,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
|
|||
case "$lt_target" in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4075 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo configure:4076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
echo '#line 4090 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo configure:4091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
case "`/usr/bin/file conftest.o`" in
|
||||
*32-bit*)
|
||||
LD="${LD-ld} -32"
|
||||
|
|
@ -4093,19 +4108,19 @@ case "$lt_target" in
|
|||
SAVE_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -belf"
|
||||
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
|
||||
echo "configure:4097: checking whether the C compiler needs -belf" >&5
|
||||
echo "configure:4112: checking whether the C compiler needs -belf" >&5
|
||||
if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4102 "configure"
|
||||
#line 4117 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
lt_cv_cc_needs_belf=yes
|
||||
else
|
||||
|
|
@ -4128,7 +4143,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
|
|||
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4132: checking for $ac_word" >&5
|
||||
echo "configure:4147: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4160,7 +4175,7 @@ if test -n "$ac_tool_prefix"; then
|
|||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4164: checking for $ac_word" >&5
|
||||
echo "configure:4179: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4195,7 +4210,7 @@ fi
|
|||
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4199: checking for $ac_word" >&5
|
||||
echo "configure:4214: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4227,7 +4242,7 @@ if test -n "$ac_tool_prefix"; then
|
|||
# Extract the first word of "as", so it can be a program name with args.
|
||||
set dummy as; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4231: checking for $ac_word" >&5
|
||||
echo "configure:4246: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4262,7 +4277,7 @@ fi
|
|||
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}objdump; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4266: checking for $ac_word" >&5
|
||||
echo "configure:4281: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4294,7 +4309,7 @@ if test -n "$ac_tool_prefix"; then
|
|||
# Extract the first word of "objdump", so it can be a program name with args.
|
||||
set dummy objdump; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4298: checking for $ac_word" >&5
|
||||
echo "configure:4313: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4568,7 +4583,7 @@ fi
|
|||
# Extract the first word of "sane-config", so it can be a program name with args.
|
||||
set dummy sane-config; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:4572: checking for $ac_word" >&5
|
||||
echo "configure:4587: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_SANE_CONFIG_PATH'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -4602,7 +4617,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for sane_init in -lsane""... $ac_c" 1>&6
|
||||
echo "configure:4606: checking for sane_init in -lsane" >&5
|
||||
echo "configure:4621: checking for sane_init in -lsane" >&5
|
||||
ac_lib_var=`echo sane'_'sane_init | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -4610,7 +4625,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsane $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4614 "configure"
|
||||
#line 4629 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -4621,7 +4636,7 @@ int main() {
|
|||
sane_init()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
|
|||
10
configure.in
10
configure.in
|
|
@ -122,7 +122,7 @@ AC_MSG_CHECKING([for struct flock in fcntl.h])
|
|||
AC_EGREP_HEADER([struct flock], fcntl.h, [AC_MSG_RESULT(yes) ;
|
||||
AC_DEFINE(HAVE_STRUCT_FLOCK, 1,
|
||||
[Define if struct flock is available.])], AC_MSG_RESULT(no))
|
||||
|
||||
|
||||
if test "$ac_cv_header_sys_scsiio_h" = "yes" \
|
||||
-a "$ac_cv_header_scsi_h" = "yes";
|
||||
then
|
||||
|
|
@ -141,6 +141,14 @@ AC_TRY_COMPILE([
|
|||
[AC_MSG_RESULT(no); AC_DEFINE(socklen_t,int,
|
||||
[Define socklen_t as \`int\' if necessary.])])
|
||||
|
||||
AC_MSG_CHECKING([for union semun in <sys/sem.h>])
|
||||
AC_TRY_COMPILE([
|
||||
#include <sys/sem.h>
|
||||
],[union semun test_semun],[AC_MSG_RESULT(yes);
|
||||
AC_DEFINE(HAVE_UNION_SEMUN,1,[Define if union semun is available.])],
|
||||
AC_MSG_RESULT(no))
|
||||
|
||||
|
||||
SANE_V4L_VERSION
|
||||
|
||||
dnl Checks for dll libraries: dl
|
||||
|
|
|
|||
|
|
@ -100,6 +100,9 @@
|
|||
/* Define if struct flock is available */
|
||||
#undef HAVE_STRUCT_FLOCK
|
||||
|
||||
/* Define if union semun is available */
|
||||
#undef HAVE_UNION_SEMUN
|
||||
|
||||
/* Define if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue