Added missing HAVE_LIBIEEE1284 macro. The test was there, but the macro wasn't set.

merge-requests/1/head
Henning Geinitz 2003-05-08 09:58:14 +00:00
rodzic dc2edcc673
commit b68941ebfe
5 zmienionych plików z 50 dodań i 28 usunięć

Wyświetl plik

@ -1,3 +1,9 @@
2003-05-08 Henning Meier-Geinitz <henning@meier-geinitz.de>
* acinclude.m4 aclocal.m4 configure include/sane/config.h.in:
Added missing HAVE_LIBIEEE1284 macro. The test was there, but
the macro wasn't set.
2003-05-07 Henning Meier-Geinitz <henning@meier-geinitz.de>
* po/Makefile.in po/sane-backends.no.po: Added Norwegian

Wyświetl plik

@ -217,6 +217,9 @@ AC_DEFUN([SANE_CHECK_IEEE1284],
],[sane_cv_use_libieee1284="no"])
],)
],)
if test "$sane_cv_use_libieee1284" = "yes" ; then
AC_DEFINE(HAVE_LIBIEEE1284,1,[Define to 1 if you have the `ieee1284' library (-lcam).])
fi
])

3
aclocal.m4 vendored
Wyświetl plik

@ -229,6 +229,9 @@ AC_DEFUN([SANE_CHECK_IEEE1284],
],[sane_cv_use_libieee1284="no"])
],)
],)
if test "$sane_cv_use_libieee1284" = "yes" ; then
AC_DEFINE(HAVE_LIBIEEE1284,1,[Define to 1 if you have the `ieee1284' library (-lcam).])
fi
])

63
configure vendored
Wyświetl plik

@ -5399,6 +5399,13 @@ echo "${ECHO_T}$sane_cv_use_libieee1284" >&6
fi
if test "$sane_cv_use_libieee1284" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBIEEE1284 1
_ACEOF
fi
@ -9110,7 +9117,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 9113 "configure"' > conftest.$ac_ext
echo '#line 9120 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -10289,7 +10296,7 @@ fi
# Provide some information about the compiler.
echo "$as_me:10292:" \
echo "$as_me:10299:" \
"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
@ -11294,11 +11301,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:11297: $lt_compile\"" >&5)
(eval echo "\"\$as_me:11304: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:11301: \$? = $ac_status" >&5
echo "$as_me:11308: \$? = $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
@ -11526,11 +11533,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:11529: $lt_compile\"" >&5)
(eval echo "\"\$as_me:11536: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:11533: \$? = $ac_status" >&5
echo "$as_me:11540: \$? = $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
@ -11593,11 +11600,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:11596: $lt_compile\"" >&5)
(eval echo "\"\$as_me:11603: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:11600: \$? = $ac_status" >&5
echo "$as_me:11607: \$? = $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
@ -13605,7 +13612,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 13608 "configure"
#line 13615 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -13703,7 +13710,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 13706 "configure"
#line 13713 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -15835,11 +15842,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:15838: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15845: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:15842: \$? = $ac_status" >&5
echo "$as_me:15849: \$? = $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
@ -15902,11 +15909,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:15905: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15912: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:15909: \$? = $ac_status" >&5
echo "$as_me:15916: \$? = $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
@ -17145,7 +17152,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 17148 "configure"
#line 17155 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -17243,7 +17250,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 17246 "configure"
#line 17253 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -18065,11 +18072,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:18075: $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:18079: \$? = $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
@ -18132,11 +18139,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:18135: $lt_compile\"" >&5)
(eval echo "\"\$as_me:18142: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:18139: \$? = $ac_status" >&5
echo "$as_me:18146: \$? = $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
@ -20072,11 +20079,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:20075: $lt_compile\"" >&5)
(eval echo "\"\$as_me:20082: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:20079: \$? = $ac_status" >&5
echo "$as_me:20086: \$? = $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
@ -20304,11 +20311,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:20307: $lt_compile\"" >&5)
(eval echo "\"\$as_me:20314: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:20311: \$? = $ac_status" >&5
echo "$as_me:20318: \$? = $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
@ -20371,11 +20378,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:20374: $lt_compile\"" >&5)
(eval echo "\"\$as_me:20381: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:20378: \$? = $ac_status" >&5
echo "$as_me:20385: \$? = $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
@ -22383,7 +22390,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 22386 "configure"
#line 22393 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -22481,7 +22488,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 22484 "configure"
#line 22491 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H

Wyświetl plik

@ -108,6 +108,9 @@
/* Define to 1 if you have the <libc.h> header file. */
#undef HAVE_LIBC_H
/* Define to 1 if you have the `ieee1284' library (-lcam). */
#undef HAVE_LIBIEEE1284
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM