Deleted unnesessary parts in listed files

Oliver Rauch
DEVEL_2_0_BRANCH-1
Oliver Rauch 2000-11-11 21:51:24 +00:00
rodzic 7bed9429bb
commit 0f083666d6
1 zmienionych plików z 18 dodań i 17 usunięć

35
configure vendored
Wyświetl plik

@ -2745,7 +2745,8 @@ echo "configure:2742: checking for SANE - version >= $min_sane_version" >&5
else else
SANE_CFLAGS=`$SANE_CONFIG $sane_config_args --cflags` SANE_CFLAGS=`$SANE_CONFIG $sane_config_args --cflags`
SANE_LDFLAGS=`$SANE_CONFIG $sane_config_args --ldflags` SANE_LDFLAGS=`$SANE_CONFIG $sane_config_args --ldflags`
SANE_LIBS=`$SANE_CONFIG $sane_config_args --libs` # SANE_LIBS=`$SANE_CONFIG $sane_config_args --libs`
SANE_LIBS=`$SANE_CONFIG $sane_config_args --libs | sed -e 's/-lintl//g'`
SANE_PREFIX=`$SANE_CONFIG $sane_config_args --prefix` SANE_PREFIX=`$SANE_CONFIG $sane_config_args --prefix`
sane_config_major_version=`$SANE_CONFIG $sane_config_args --version | \ sane_config_major_version=`$SANE_CONFIG $sane_config_args --version | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
@ -2763,7 +2764,7 @@ echo "configure:2742: checking for SANE - version >= $min_sane_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c" echo $ac_n "cross compiling; assumed OK... $ac_c"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2767 "configure" #line 2768 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sane/sane.h> #include <sane/sane.h>
@ -2807,7 +2808,7 @@ main ()
} }
EOF EOF
if { (eval echo configure:2811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:2812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
: :
else else
@ -2841,7 +2842,7 @@ fi
CFLAGS="$CFLAGS $SANE_CFLAGS" CFLAGS="$CFLAGS $SANE_CFLAGS"
LIBS="$LIBS $SANE_LIBS" LIBS="$LIBS $SANE_LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2845 "configure" #line 2846 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sane/sane.h> #include <sane/sane.h>
@ -2851,7 +2852,7 @@ int main() {
return ((sane_major_version) || (sane_minor_version) || (sane_micro_version)); return ((sane_major_version) || (sane_minor_version) || (sane_micro_version));
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means" 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" echo "*** that the run-time linker is not finding SANE or finding the wrong"
@ -2928,7 +2929,7 @@ fi
# Extract the first word of "gtk-config", so it can be a program name with args. # Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2 set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2932: checking for $ac_word" >&5 echo "configure:2933: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -2963,7 +2964,7 @@ fi
min_gtk_version=1.2.0 min_gtk_version=1.2.0
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
echo "configure:2967: checking for GTK - version >= $min_gtk_version" >&5 echo "configure:2968: checking for GTK - version >= $min_gtk_version" >&5
no_gtk="" no_gtk=""
if test "$GTK_CONFIG" = "no" ; then if test "$GTK_CONFIG" = "no" ; then
no_gtk=yes no_gtk=yes
@ -2986,7 +2987,7 @@ echo "configure:2967: checking for GTK - version >= $min_gtk_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c" echo $ac_n "cross compiling; assumed OK... $ac_c"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2990 "configure" #line 2991 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@ -3049,7 +3050,7 @@ main ()
} }
EOF EOF
if { (eval echo configure:3053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
: :
else else
@ -3083,7 +3084,7 @@ fi
CFLAGS="$CFLAGS $GTK_CFLAGS" CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS" LIBS="$LIBS $GTK_LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3087 "configure" #line 3088 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@ -3093,7 +3094,7 @@ int main() {
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
echo "*** The test program compiled, but did not run. This usually means" 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" echo "*** that the run-time linker is not finding GTK or finding the wrong"
@ -3147,17 +3148,17 @@ if test "${USE_GIMP}" = "yes"; then
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3151: checking for $ac_hdr" >&5 echo "configure:3152: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3156 "configure" #line 3157 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
@ -3187,17 +3188,17 @@ done
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3191: checking for $ac_hdr" >&5 echo "configure:3192: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3196 "configure" #line 3197 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*