Removed some unnecessary parts of configure script

DEVEL_2_0_BRANCH-1
Oliver Rauch 2000-11-11 20:22:38 +00:00
rodzic c291ea7386
commit 4e170bf16e
2 zmienionych plików z 88 dodań i 89 usunięć

168
configure vendored
Wyświetl plik

@ -16,11 +16,11 @@ ac_help="$ac_help
ac_help="$ac_help
--with-x use the X Window System"
ac_help="$ac_help
--with-sane-prefix=PFX Prefix where SANE is installed (optional)"
--with-sane-prefix=PFX Prefix where SANE is installed (optional)"
ac_help="$ac_help
--with-sane-exec-prefix=PFX Exec prefix where SANE is installed (optional)"
ac_help="$ac_help
--disable-sanetest Do not try to compile and run a test SANE program"
--disable-sanetest Do not try to compile and run a test SANE program"
ac_help="$ac_help
--with-gtk-prefix=PFX Prefix where GTK is installed (optional)"
ac_help="$ac_help
@ -1418,23 +1418,21 @@ EOF
fi
for ac_hdr in fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
sys/time.h sys/scanio.h sys/socket.h sys/io.h asm/io.h gscdds.h sys/hw.h \
sys/types.h zlib.h
for ac_hdr in fcntl.h unistd.h libc.h sys/time.h sys/types.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:1428: checking for $ac_hdr" >&5
echo "configure:1426: 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 1433 "configure"
#line 1431 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:1438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:1436: \"$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*
@ -1462,12 +1460,12 @@ done
echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:1466: checking for working const" >&5
echo "configure:1464: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1471 "configure"
#line 1469 "configure"
#include "confdefs.h"
int main() {
@ -1516,7 +1514,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
if { (eval echo configure:1520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@ -1537,21 +1535,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
echo "configure:1541: checking for inline" >&5
echo "configure:1539: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
#line 1548 "configure"
#line 1546 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
if { (eval echo configure:1555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@ -1577,12 +1575,12 @@ EOF
esac
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
echo "configure:1581: checking return type of signal handlers" >&5
echo "configure:1579: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1586 "configure"
#line 1584 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@ -1599,7 +1597,7 @@ int main() {
int i;
; return 0; }
EOF
if { (eval echo configure:1603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
if { (eval echo configure:1601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@ -1618,12 +1616,12 @@ EOF
echo $ac_n "checking for size_t""... $ac_c" 1>&6
echo "configure:1622: checking for size_t" >&5
echo "configure:1620: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1627 "configure"
#line 1625 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -1651,12 +1649,12 @@ EOF
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
echo "configure:1655: checking for pid_t" >&5
echo "configure:1653: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1660 "configure"
#line 1658 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -1684,12 +1682,12 @@ EOF
fi
echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
echo "configure:1688: checking for ssize_t" >&5
echo "configure:1686: checking for ssize_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1693 "configure"
#line 1691 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -1717,12 +1715,12 @@ EOF
fi
echo $ac_n "checking for u_char""... $ac_c" 1>&6
echo "configure:1721: checking for u_char" >&5
echo "configure:1719: checking for u_char" >&5
if eval "test \"`echo '$''{'ac_cv_type_u_char'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1726 "configure"
#line 1724 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -1750,12 +1748,12 @@ EOF
fi
echo $ac_n "checking for u_int""... $ac_c" 1>&6
echo "configure:1754: checking for u_int" >&5
echo "configure:1752: checking for u_int" >&5
if eval "test \"`echo '$''{'ac_cv_type_u_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1759 "configure"
#line 1757 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -1783,12 +1781,12 @@ EOF
fi
echo $ac_n "checking for u_long""... $ac_c" 1>&6
echo "configure:1787: checking for u_long" >&5
echo "configure:1785: checking for u_long" >&5
if eval "test \"`echo '$''{'ac_cv_type_u_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1792 "configure"
#line 1790 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@ -1817,7 +1815,7 @@ fi
echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
echo "configure:1821: checking for sqrt in -lm" >&5
echo "configure:1819: 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
@ -1825,7 +1823,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
#line 1829 "configure"
#line 1827 "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
@ -1836,7 +1834,7 @@ int main() {
sqrt()
; return 0; }
EOF
if { (eval echo configure:1840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1838: \"$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
@ -1867,19 +1865,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:1871: checking for working alloca.h" >&5
echo "configure:1869: 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 1876 "configure"
#line 1874 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
if { (eval echo configure:1883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1881: \"$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
@ -1900,12 +1898,12 @@ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
echo "configure:1904: checking for alloca" >&5
echo "configure:1902: 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 1909 "configure"
#line 1907 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@ -1933,7 +1931,7 @@ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
if { (eval echo configure:1937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:1935: \"$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
@ -1965,12 +1963,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
echo "configure:1969: checking whether alloca needs Cray hooks" >&5
echo "configure:1967: 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 1974 "configure"
#line 1972 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@ -1995,12 +1993,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:1999: checking for $ac_func" >&5
echo "configure:1997: 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 2004 "configure"
#line 2002 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@ -2023,7 +2021,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2025: \"$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
@ -2050,7 +2048,7 @@ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
echo "configure:2054: checking stack direction for C alloca" >&5
echo "configure:2052: 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
@ -2058,7 +2056,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
#line 2062 "configure"
#line 2060 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@ -2077,7 +2075,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
if { (eval echo configure:2081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2079: \"$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
@ -2104,17 +2102,17 @@ 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:2108: checking for $ac_hdr" >&5
echo "configure:2106: 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 2113 "configure"
#line 2111 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2116: \"$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*
@ -2143,12 +2141,12 @@ done
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:2147: checking for $ac_func" >&5
echo "configure:2145: 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 2152 "configure"
#line 2150 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@ -2171,7 +2169,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:2175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2173: \"$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
@ -2196,7 +2194,7 @@ fi
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
echo "configure:2200: checking for working mmap" >&5
echo "configure:2198: 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
@ -2204,7 +2202,7 @@ else
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
#line 2208 "configure"
#line 2206 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
@ -2344,7 +2342,7 @@ main()
}
EOF
if { (eval echo configure:2348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2346: \"$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
@ -2369,12 +2367,12 @@ fi
for ac_func in atexit mkdir sigprocmask strdup strndup strftime strstr strsep strtod snprintf usleep strcasecmp strncasecmp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:2373: checking for $ac_func" >&5
echo "configure:2371: 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 2378 "configure"
#line 2376 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@ -2397,7 +2395,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:2401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2399: \"$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
@ -2429,7 +2427,7 @@ done
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
echo "configure:2433: checking for X" >&5
echo "configure:2431: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@ -2491,12 +2489,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
#line 2495 "configure"
#line 2493 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:2498: \"$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*
@ -2565,14 +2563,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2569 "configure"
#line 2567 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
if { (eval echo configure:2576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
@ -2705,7 +2703,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:2709: checking for $ac_word" >&5
echo "configure:2707: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SANE_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -2740,7 +2738,7 @@ fi
min_sane_version=1.0.0
echo $ac_n "checking for SANE - version >= $min_sane_version""... $ac_c" 1>&6
echo "configure:2744: checking for SANE - version >= $min_sane_version" >&5
echo "configure:2742: checking for SANE - version >= $min_sane_version" >&5
no_sane=""
if test "$SANE_CONFIG" = "no" ; then
no_sane=yes
@ -2765,7 +2763,7 @@ echo "configure:2744: checking for SANE - version >= $min_sane_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 2769 "configure"
#line 2767 "configure"
#include "confdefs.h"
#include <sane/sane.h>
@ -2809,7 +2807,7 @@ main ()
}
EOF
if { (eval echo configure:2813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@ -2843,7 +2841,7 @@ fi
CFLAGS="$CFLAGS $SANE_CFLAGS"
LIBS="$LIBS $SANE_LIBS"
cat > conftest.$ac_ext <<EOF
#line 2847 "configure"
#line 2845 "configure"
#include "confdefs.h"
#include <sane/sane.h>
@ -2853,7 +2851,7 @@ int main() {
return ((sane_major_version) || (sane_minor_version) || (sane_micro_version));
; return 0; }
EOF
if { (eval echo configure:2857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:2855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SANE or finding the wrong"
@ -2930,7 +2928,7 @@ fi
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2934: checking for $ac_word" >&5
echo "configure:2932: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@ -2965,7 +2963,7 @@ fi
min_gtk_version=1.2.0
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
echo "configure:2969: checking for GTK - version >= $min_gtk_version" >&5
echo "configure:2967: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" = "no" ; then
no_gtk=yes
@ -2988,7 +2986,7 @@ echo "configure:2969: checking for GTK - version >= $min_gtk_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 2992 "configure"
#line 2990 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
@ -3051,7 +3049,7 @@ main ()
}
EOF
if { (eval echo configure:3055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:3053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@ -3085,7 +3083,7 @@ fi
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
cat > conftest.$ac_ext <<EOF
#line 3089 "configure"
#line 3087 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
@ -3095,7 +3093,7 @@ int main() {
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
; return 0; }
EOF
if { (eval echo configure:3099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:3097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK or finding the wrong"
@ -3149,17 +3147,17 @@ if test "${USE_GIMP}" = "yes"; then
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3153: checking for $ac_hdr" >&5
echo "configure:3151: 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 3158 "configure"
#line 3156 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:3161: \"$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*
@ -3189,17 +3187,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3193: checking for $ac_hdr" >&5
echo "configure:3191: 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 3198 "configure"
#line 3196 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:3201: \"$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*
@ -3237,7 +3235,7 @@ CPPFLAGS="${saved_CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} \
-DPATH_SANE_DATA_DIR=\$(sanedatadir) \
-DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR} -DSANE_V_MAJOR=${SANE_V_MAJOR} -DSANE_V_BUILD=${SANE_V_BUILD}"
-DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR} -DSANE_V_BUILD=${SANE_V_BUILD} -DSANE_V_MAJOR=${SANE_V_MAJOR}"
if test "${HAVE_SANE}" = "no"; then
echo "****************************************************************"
@ -3264,6 +3262,7 @@ fi
# Check whether --enable-foo1 or --disable-foo1 was given.
if test "${enable_foo1+set}" = set; then
enableval="$enable_foo1"
@ -3379,7 +3378,7 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "Makefile lib/Makefile src/Makefile include/Makefile sanei/Makefile doc/Makefile include/sane/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
trap 'rm -fr `echo "Makefile lib/Makefile src/Makefile sanei/Makefile doc/Makefile include/sane/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@ -3436,6 +3435,7 @@ s%@BINPROGS@%$BINPROGS%g
s%@GIMP_LIBS@%$GIMP_LIBS%g
s%@V_MAJOR@%$V_MAJOR%g
s%@V_MINOR@%$V_MINOR%g
s%@V_BUILD@%$V_BUILD%g
s%@DLL_PRELOAD@%$DLL_PRELOAD%g
CEOF
@ -3478,7 +3478,7 @@ EOF
cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile src/Makefile include/Makefile sanei/Makefile doc/Makefile"}
CONFIG_FILES=\${CONFIG_FILES-"Makefile lib/Makefile src/Makefile sanei/Makefile doc/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

Wyświetl plik

@ -54,9 +54,7 @@ fi
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
sys/time.h sys/scanio.h sys/socket.h sys/io.h asm/io.h gscdds.h sys/hw.h \
sys/types.h zlib.h)
AC_CHECK_HEADERS(fcntl.h unistd.h libc.h sys/time.h sys/types.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@ -115,7 +113,7 @@ AC_SUBST(GTK_LIBS)
AC_SUBST(GIMP_LIBS)
CPPFLAGS="${CPPFLAGS} \
-DPATH_SANE_DATA_DIR=\$(sanedatadir) \
-DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR} -DSANE_V_MAJOR=${SANE_V_MAJOR} -DSANE_V_BUILD=${SANE_V_BUILD}"
-DV_MAJOR=${V_MAJOR} -DV_MINOR=${V_MINOR} -DSANE_V_BUILD=${SANE_V_BUILD} -DSANE_V_MAJOR=${SANE_V_MAJOR}"
dnl Print error message if sane or gtk is missing
if test "${HAVE_SANE}" = "no"; then
@ -141,6 +139,7 @@ fi
AC_SUBST(V_MAJOR)
AC_SUBST(V_MINOR)
AC_SUBST(V_BUILD)
AC_SUBST(DLL_PRELOAD)
AC_ARG_ENABLE(foo1, [
@ -151,7 +150,7 @@ AC_ARG_ENABLE(foo2, [
To add include or library paths call:
[env] CPPFLAGS=\"-I/path/to/foo/include\" LDFLAGS=\"-L/path/to/foo/libs\" ./configure])
AC_OUTPUT([Makefile lib/Makefile src/Makefile include/Makefile sanei/Makefile doc/Makefile],)
AC_OUTPUT([Makefile lib/Makefile src/Makefile sanei/Makefile doc/Makefile],)
echo "****************************************************************"
echo "* *"