kopia lustrzana https://gitlab.com/sane-project/backends
Moved CPPFLAGS definition down to avoid problems with libtool tests for -fPIC.
Henning Geinitz
rodzic
78a02e266b
commit
2ce6d33e26
|
|
@ -14,6 +14,8 @@
|
|||
given. Code indented by indent -gnu. Added man page.
|
||||
* doc/descriptions-external/hp4200.desc: Removed (backend is now
|
||||
included).
|
||||
* configure configure.in: Moved CPPFLAGS definition down to avoid
|
||||
problems with libtool tests for -fPIC.
|
||||
|
||||
2005-08-10 Gerhard Jaeger <gerhard@gjaeger.de>
|
||||
|
||||
|
|
|
|||
|
|
@ -3416,10 +3416,6 @@ fi
|
|||
echo "$as_me:$LINENO: result: $LINKER_RPATH" >&5
|
||||
echo "${ECHO_T}$LINKER_RPATH" >&6
|
||||
|
||||
CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \
|
||||
-DPATH_SANE_DATA_DIR=\$(datadir) \
|
||||
-DPATH_SANE_LOCK_DIR=\$(localstatedir) \
|
||||
-DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
|
||||
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
|
|
@ -11005,7 +11001,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 11008 "configure"' > conftest.$ac_ext
|
||||
echo '#line 11004 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -12238,7 +12234,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:12241:" \
|
||||
echo "$as_me:12237:" \
|
||||
"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
|
||||
|
|
@ -13297,11 +13293,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:13300: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13296: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13304: \$? = $ac_status" >&5
|
||||
echo "$as_me:13300: \$? = $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
|
||||
|
|
@ -13540,11 +13536,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:13543: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13539: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13547: \$? = $ac_status" >&5
|
||||
echo "$as_me:13543: \$? = $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
|
||||
|
|
@ -13600,11 +13596,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:13603: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13599: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13607: \$? = $ac_status" >&5
|
||||
echo "$as_me:13603: \$? = $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
|
||||
|
|
@ -15776,7 +15772,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15779 "configure"
|
||||
#line 15775 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -15874,7 +15870,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 15877 "configure"
|
||||
#line 15873 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -18069,11 +18065,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:18072: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18068: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:18076: \$? = $ac_status" >&5
|
||||
echo "$as_me:18072: \$? = $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
|
||||
|
|
@ -18129,11 +18125,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:18132: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18128: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:18136: \$? = $ac_status" >&5
|
||||
echo "$as_me:18132: \$? = $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
|
||||
|
|
@ -19483,7 +19479,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19486 "configure"
|
||||
#line 19482 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -19581,7 +19577,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19584 "configure"
|
||||
#line 19580 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -20418,11 +20414,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:20421: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:20417: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:20425: \$? = $ac_status" >&5
|
||||
echo "$as_me:20421: \$? = $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
|
||||
|
|
@ -20478,11 +20474,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:20481: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:20477: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:20485: \$? = $ac_status" >&5
|
||||
echo "$as_me:20481: \$? = $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
|
||||
|
|
@ -22515,11 +22511,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:22518: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:22514: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:22522: \$? = $ac_status" >&5
|
||||
echo "$as_me:22518: \$? = $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
|
||||
|
|
@ -22758,11 +22754,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:22761: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:22757: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:22765: \$? = $ac_status" >&5
|
||||
echo "$as_me:22761: \$? = $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
|
||||
|
|
@ -22818,11 +22814,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:22821: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:22817: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:22825: \$? = $ac_status" >&5
|
||||
echo "$as_me:22821: \$? = $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
|
||||
|
|
@ -24994,7 +24990,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 24997 "configure"
|
||||
#line 24993 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -25092,7 +25088,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 25095 "configure"
|
||||
#line 25091 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -26113,6 +26109,11 @@ if test "$ac_cv_header_windows_h" = "yes" -o "$ac_cv_header_be_kernel_OS_h" = "y
|
|||
fi
|
||||
|
||||
|
||||
CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \
|
||||
-DPATH_SANE_DATA_DIR=\$(datadir) \
|
||||
-DPATH_SANE_LOCK_DIR=\$(localstatedir) \
|
||||
-DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
|
||||
|
||||
if test "${ac_cv_header_sys_socket_h}" = "no"; then
|
||||
echo "*** disabling saned (sys/socket.h not found)"
|
||||
SANED=
|
||||
|
|
|
|||
|
|
@ -73,10 +73,6 @@ AC_SUBST(INCLUDES)
|
|||
SANE_SET_CFLAGS([$is_release])
|
||||
SANE_SET_LDFLAGS
|
||||
SANE_LINKER_RPATH
|
||||
CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \
|
||||
-DPATH_SANE_DATA_DIR=\$(datadir) \
|
||||
-DPATH_SANE_LOCK_DIR=\$(localstatedir) \
|
||||
-DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
|
||||
|
||||
dnl ***********************************************************************
|
||||
dnl Checks for unix variants
|
||||
|
|
@ -310,6 +306,11 @@ dnl enable/disable backends and features based on previous tests and user's
|
|||
dnl choice
|
||||
dnl ***********************************************************************
|
||||
|
||||
CPPFLAGS="${CPPFLAGS} -DPATH_SANE_CONFIG_DIR=\$(configdir) \
|
||||
-DPATH_SANE_DATA_DIR=\$(datadir) \
|
||||
-DPATH_SANE_LOCK_DIR=\$(localstatedir) \
|
||||
-DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR}"
|
||||
|
||||
if test "${ac_cv_header_sys_socket_h}" = "no"; then
|
||||
echo "*** disabling saned (sys/socket.h not found)"
|
||||
SANED=
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue