kopia lustrzana https://gitlab.com/sane-project/frontends
Added warning if sane major version differs
Oliver Rauch
rodzic
d0f81b991e
commit
9da7f0c071
|
|
@ -2788,27 +2788,35 @@ main ()
|
|||
{
|
||||
return 0;
|
||||
}
|
||||
else if ($sane_config_major_version > major)
|
||||
{
|
||||
printf("\n*** A too new version of SANE (%d.%d.%d) was found.\n",
|
||||
$sane_config_major_version, $sane_config_minor_version, $sane_config_micro_version);
|
||||
printf("*** You need a version of SANE with the major version number %d.\n", major);
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("\n*** An old version of SANE (%d.%d.%d) was found.\n",
|
||||
$sane_config_major_version, $sane_config_minor_version, $sane_config_micro_version);
|
||||
printf("*** You need a version of SANE newer than %d.%d.%d. The latest version of\n",
|
||||
major, minor, micro);
|
||||
printf("*** SANE is always available from ftp://ftp.mostang.com\n");
|
||||
printf("***\n");
|
||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
||||
printf("*** probably means that the wrong copy of the sane-config shell script is\n");
|
||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
||||
printf("*** of SANE, but you can also set the SANE_CONFIG environment to point to the\n");
|
||||
printf("*** correct copy of sane-config. (In this case, you will have to\n");
|
||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
||||
printf("*** so that the correct libraries are found at run-time))\n");
|
||||
}
|
||||
|
||||
printf("*** SANE is always available from ftp://ftp.mostang.com\n");
|
||||
printf("***\n");
|
||||
printf("*** If you have already installed a sufficient version, this error\n");
|
||||
printf("*** probably means that the wrong copy of the sane-config shell script is\n");
|
||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
||||
printf("*** of SANE, but you can also set the SANE_CONFIG environment to point to the\n");
|
||||
printf("*** correct copy of sane-config. (In this case, you will have to\n");
|
||||
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
|
||||
printf("*** so that the correct libraries are found at run-time))\n");
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:2812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -2842,7 +2850,7 @@ fi
|
|||
CFLAGS="$CFLAGS $SANE_CFLAGS"
|
||||
LIBS="$LIBS $SANE_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2846 "configure"
|
||||
#line 2854 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <sane/sane.h>
|
||||
|
|
@ -2852,7 +2860,7 @@ int main() {
|
|||
return ((sane_major_version) || (sane_minor_version) || (sane_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2864: \"$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"
|
||||
|
|
@ -2929,7 +2937,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:2933: checking for $ac_word" >&5
|
||||
echo "configure:2941: 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
|
||||
|
|
@ -2964,7 +2972,7 @@ fi
|
|||
|
||||
min_gtk_version=1.2.0
|
||||
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
|
||||
echo "configure:2968: checking for GTK - version >= $min_gtk_version" >&5
|
||||
echo "configure:2976: checking for GTK - version >= $min_gtk_version" >&5
|
||||
no_gtk=""
|
||||
if test "$GTK_CONFIG" = "no" ; then
|
||||
no_gtk=yes
|
||||
|
|
@ -2987,7 +2995,7 @@ echo "configure:2968: checking for GTK - version >= $min_gtk_version" >&5
|
|||
echo $ac_n "cross compiling; assumed OK... $ac_c"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2991 "configure"
|
||||
#line 2999 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
|
@ -3050,7 +3058,7 @@ main ()
|
|||
}
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:3062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
:
|
||||
else
|
||||
|
|
@ -3084,7 +3092,7 @@ fi
|
|||
CFLAGS="$CFLAGS $GTK_CFLAGS"
|
||||
LIBS="$LIBS $GTK_LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3088 "configure"
|
||||
#line 3096 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
|
@ -3094,7 +3102,7 @@ int main() {
|
|||
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3106: \"$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"
|
||||
|
|
@ -3148,17 +3156,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:3152: checking for $ac_hdr" >&5
|
||||
echo "configure:3160: 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 3157 "configure"
|
||||
#line 3165 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:3162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:3170: \"$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*
|
||||
|
|
@ -3188,17 +3196,17 @@ done
|
|||
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:3200: 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 3205 "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:3210: \"$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*
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue