Fixed check for usbcalls.h on OS/2 (patch from Paul Smedley <paul@smedley.info>).

merge-requests/1/head
Henning Geinitz 2005-08-19 15:26:50 +00:00
rodzic 269fd05fb2
commit e50187fb8f
3 zmienionych plików z 44 dodań i 198 usunięć

Wyświetl plik

@ -1,3 +1,8 @@
2005-08-19 Henning Meier-Geinitz <henning@meier-geinitz.de>
* configure configure.in: Fixed check for usbcalls.h on OS/2
(patch from Paul Smedley <paul@smedley.info>).
2005-08-19 Gerhard Jaeger <gerhard@gjaeger.de>
* doc/plustek/Plustek-USB.changes: Update.

228
configure vendored
Wyświetl plik

@ -7390,25 +7390,21 @@ fi
if test "${ac_cv_header_usbcalls_h+set}" = set; then
echo "$as_me:$LINENO: checking for usbcalls.h" >&5
echo "$as_me:$LINENO: checking for usbcalls.h" >&5
echo $ECHO_N "checking for usbcalls.h... $ECHO_C" >&6
if test "${ac_cv_header_usbcalls_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: $ac_cv_header_usbcalls_h" >&5
echo "${ECHO_T}$ac_cv_header_usbcalls_h" >&6
else
# Is the header compilable?
echo "$as_me:$LINENO: checking usbcalls.h usability" >&5
echo $ECHO_N "checking usbcalls.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <usb.h>
#include <os2.h>
#include <usbcalls.h>
_ACEOF
rm -f conftest.$ac_objext
@ -7432,167 +7428,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_header_compiler=yes
ac_cv_header_usbcalls_h=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
ac_cv_header_usbcalls_h=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
# Is the header present?
echo "$as_me:$LINENO: checking usbcalls.h presence" >&5
echo $ECHO_N "checking usbcalls.h presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <usbcalls.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
else
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: usbcalls.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: usbcalls.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: usbcalls.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: usbcalls.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: usbcalls.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: usbcalls.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: usbcalls.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: usbcalls.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: usbcalls.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: usbcalls.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: usbcalls.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: usbcalls.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: usbcalls.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: usbcalls.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: usbcalls.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: usbcalls.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
## ------------------------------------------------- ##
## Report this to sane-devel@lists.alioth.debian.org ##
## ------------------------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
echo "$as_me:$LINENO: checking for usbcalls.h" >&5
echo $ECHO_N "checking for usbcalls.h... $ECHO_C" >&6
if test "${ac_cv_header_usbcalls_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_usbcalls_h=$ac_header_preproc
fi
echo "$as_me:$LINENO: result: $ac_cv_header_usbcalls_h" >&5
echo "${ECHO_T}$ac_cv_header_usbcalls_h" >&6
fi
if test $ac_cv_header_usbcalls_h = yes; then
echo "$as_me:$LINENO: checking for rsm_open_device in -lusbcalls" >&5
echo $ECHO_N "checking for rsm_open_device in -lusbcalls... $ECHO_C" >&6
if test "${ac_cv_lib_usbcalls_rsm_open_device+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lusbcalls $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char rsm_open_device ();
int
main ()
{
rsm_open_device ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_usbcalls_rsm_open_device=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_usbcalls_rsm_open_device=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_usbcalls_rsm_open_device" >&5
echo "${ECHO_T}$ac_cv_lib_usbcalls_rsm_open_device" >&6
if test $ac_cv_lib_usbcalls_rsm_open_device = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_USBCALLS 1
@ -7600,10 +7448,6 @@ _ACEOF
LIBS="$LIBS -lusbcalls"
fi
fi
@ -11001,7 +10845,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 11004 "configure"' > conftest.$ac_ext
echo '#line 10848 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -12234,7 +12078,7 @@ fi
# Provide some information about the compiler.
echo "$as_me:12237:" \
echo "$as_me:12081:" \
"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
@ -13293,11 +13137,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:13296: $lt_compile\"" >&5)
(eval echo "\"\$as_me:13140: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:13300: \$? = $ac_status" >&5
echo "$as_me:13144: \$? = $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
@ -13536,11 +13380,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:13539: $lt_compile\"" >&5)
(eval echo "\"\$as_me:13383: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:13543: \$? = $ac_status" >&5
echo "$as_me:13387: \$? = $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
@ -13596,11 +13440,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:13599: $lt_compile\"" >&5)
(eval echo "\"\$as_me:13443: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:13603: \$? = $ac_status" >&5
echo "$as_me:13447: \$? = $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
@ -15772,7 +15616,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 15775 "configure"
#line 15619 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -15870,7 +15714,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 15873 "configure"
#line 15717 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -18065,11 +17909,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:18068: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17912: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:18072: \$? = $ac_status" >&5
echo "$as_me:17916: \$? = $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
@ -18125,11 +17969,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:18128: $lt_compile\"" >&5)
(eval echo "\"\$as_me:17972: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:18132: \$? = $ac_status" >&5
echo "$as_me:17976: \$? = $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
@ -19479,7 +19323,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 19482 "configure"
#line 19326 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -19577,7 +19421,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 19580 "configure"
#line 19424 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -20414,11 +20258,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:20417: $lt_compile\"" >&5)
(eval echo "\"\$as_me:20261: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:20421: \$? = $ac_status" >&5
echo "$as_me:20265: \$? = $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
@ -20474,11 +20318,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:20477: $lt_compile\"" >&5)
(eval echo "\"\$as_me:20321: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:20481: \$? = $ac_status" >&5
echo "$as_me:20325: \$? = $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
@ -22511,11 +22355,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:22514: $lt_compile\"" >&5)
(eval echo "\"\$as_me:22358: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:22518: \$? = $ac_status" >&5
echo "$as_me:22362: \$? = $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
@ -22754,11 +22598,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:22757: $lt_compile\"" >&5)
(eval echo "\"\$as_me:22601: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:22761: \$? = $ac_status" >&5
echo "$as_me:22605: \$? = $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
@ -22814,11 +22658,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:22817: $lt_compile\"" >&5)
(eval echo "\"\$as_me:22661: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:22821: \$? = $ac_status" >&5
echo "$as_me:22665: \$? = $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
@ -24990,7 +24834,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 24993 "configure"
#line 24837 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -25088,7 +24932,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 25091 "configure"
#line 24935 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H

Wyświetl plik

@ -135,14 +135,11 @@ AC_CHECK_HEADER(resmgr.h,[
])
AC_CHECK_HEADER(usbcalls.h,[
AC_CHECK_LIB(
usbcalls,
rsm_open_device,[
AC_DEFINE(HAVE_USBCALLS,1,[define if you have the usbcalls library])
LIBS="$LIBS -lusbcalls"
]
)
])
],,[
#include <usb.h>
#include <os2.h>])
dnl ***********************************************************************