mirror
/
sane-project-frontends
kopia lustrzana https://gitlab.com/sane-project/frontends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

2002-01-08 Oliver Rauch <Oliver.Rauch@Rauch-Domain.DE> 

* configure.in: removed "rm -f $cache_file" when sane or gtk
          was not found. This was bad when a user used a global cache_file
DEVEL_2_0_BRANCH-1
Oliver Rauch 2002-01-08 17:19:23 +00:00
rodzic e6e433cea0
commit 8a8c8909d4
3 zmienionych plików z 48 dodań i 38 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
Changelog
Wyświetl plik

@ -1,3 +1,8 @@
2002-01-08 Oliver Rauch <Oliver.Rauch@Rauch-Domain.DE>
* configure.in: removed "rm -f $cache_file" when sane or gtk
was not found. This was bad when a user used a global cache_file
2001-11-29 Oliver Schwartz <Oliver.Schwartz@gmx.de> 2001-11-29 Oliver Schwartz <Oliver.Schwartz@gmx.de>
* preview.c: in function restore_preview_image() check for * preview.c: in function restore_preview_image() check for

73
configure vendored
Wyświetl plik

@ -1480,7 +1480,7 @@ else
int main() { int main() {
/* Ultrix mips cc rejects this. */ /* Ultrix mips cc rejects this. */
typedef int charset[2]; const charset x = {0,0}; typedef int charset[2]; const charset x;
/* SunOS 4.1.1 cc rejects this. */ /* SunOS 4.1.1 cc rejects this. */
char const *const *ccp; char const *const *ccp;
char **p; char **p;
@ -1555,7 +1555,7 @@ for ac_kw in inline __inline__ __inline; do
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
} int $ac_kw foo() { } $ac_kw foo() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@ -1883,7 +1883,7 @@ else
#include "confdefs.h" #include "confdefs.h"
#include <alloca.h> #include <alloca.h>
int main() { int main() {
void *p = alloca(2 * sizeof(int)); char *p = alloca(2 * sizeof(int));
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@ -2238,15 +2238,12 @@ else
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <stdlib.h>
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
/* This mess was copied from the GNU getpagesize.h. */ /* This mess was copied from the GNU getpagesize.h. */
#ifndef HAVE_GETPAGESIZE #ifndef HAVE_GETPAGESIZE
# ifdef HAVE_UNISTD_H
# include <unistd.h>
# endif
/* Assume that all systems that can run configure have sys/param.h. */ /* Assume that all systems that can run configure have sys/param.h. */
# ifndef HAVE_SYS_PARAM_H # ifndef HAVE_SYS_PARAM_H
@ -2301,7 +2298,7 @@ main()
/* /*
* First, make a file with some known garbage in it. * First, make a file with some known garbage in it.
*/ */
data = (char*)malloc(pagesize); data = malloc(pagesize);
if (!data) if (!data)
exit(1); exit(1);
for (i = 0; i < pagesize; ++i) for (i = 0; i < pagesize; ++i)
@ -2322,7 +2319,7 @@ main()
fd = open("conftestmmap", O_RDWR); fd = open("conftestmmap", O_RDWR);
if (fd < 0) if (fd < 0)
exit(1); exit(1);
data2 = (char*)malloc(2 * pagesize); data2 = malloc(2 * pagesize);
if (!data2) if (!data2)
exit(1); exit(1);
data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
@ -2340,7 +2337,7 @@ main()
*/ */
for (i = 0; i < pagesize; ++i) for (i = 0; i < pagesize; ++i)
*(data2 + i) = *(data2 + i) + 1; *(data2 + i) = *(data2 + i) + 1;
data3 = (char*)malloc(pagesize); data3 = malloc(pagesize);
if (!data3) if (!data3)
exit(1); exit(1);
if (read(fd, data3, pagesize) != pagesize) if (read(fd, data3, pagesize) != pagesize)
@ -2354,7 +2351,7 @@ main()
} }
EOF EOF
if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:2355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_mmap_fixed_mapped=yes
else else
@ -2380,12 +2377,12 @@ for ac_func in atexit mkdir sigprocmask strdup strndup strftime strstr \
strsep strtod snprintf usleep strcasecmp strncasecmp getenv isfdtype vsyslog strsep strtod snprintf usleep strcasecmp strncasecmp getenv isfdtype vsyslog
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:2384: checking for $ac_func" >&5 echo "configure:2381: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+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 2389 "configure" #line 2386 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
@ -2408,7 +2405,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
@ -2475,7 +2472,7 @@ fi
# Extract the first word of "sane-config", so it can be a program name with args. # Extract the first word of "sane-config", so it can be a program name with args.
set dummy sane-config; ac_word=$2 set dummy sane-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:2479: checking for $ac_word" >&5 echo "configure:2476: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SANE_CONFIG'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_SANE_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
@ -2510,7 +2507,7 @@ fi
min_sane_version=1.0.0 min_sane_version=1.0.0
echo $ac_n "checking for SANE - version >= $min_sane_version""... $ac_c" 1>&6 echo $ac_n "checking for SANE - version >= $min_sane_version""... $ac_c" 1>&6
echo "configure:2514: checking for SANE - version >= $min_sane_version" >&5 echo "configure:2511: checking for SANE - version >= $min_sane_version" >&5
no_sane="" no_sane=""
if test "$SANE_CONFIG" = "no" ; then if test "$SANE_CONFIG" = "no" ; then
no_sane=yes no_sane=yes
@ -2538,7 +2535,7 @@ echo "configure:2514: 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 2542 "configure" #line 2539 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sane/sane.h> #include <sane/sane.h>
@ -2590,7 +2587,7 @@ main ()
} }
EOF EOF
if { (eval echo configure:2594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:2591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
: :
else else
@ -2626,7 +2623,7 @@ fi
LIBS="$LIBS $SANE_LIBS" LIBS="$LIBS $SANE_LIBS"
LDFLAGS="$LDFLAGS $SANE_LDFLAGS" LDFLAGS="$LDFLAGS $SANE_LDFLAGS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2630 "configure" #line 2627 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sane/sane.h> #include <sane/sane.h>
@ -2636,7 +2633,7 @@ int main() {
return (SANE_CURRENT_MAJOR); return (SANE_CURRENT_MAJOR);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2637: \"$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"
@ -2684,7 +2681,9 @@ if test "x${HAVE_SANE}" = "x"; then
echo " - the SANE libraries can't be found because /usr/local/lib/ isn't" echo " - the SANE libraries can't be found because /usr/local/lib/ isn't"
echo " searched by the dynamic linker (see INSTALL for details)" echo " searched by the dynamic linker (see INSTALL for details)"
echo "**********************************************************************" echo "**********************************************************************"
rm -f $cache_file echo ""
echo "you may need to remove $cache_file before you run configure again"
echo ""
exit exit
fi fi
@ -2730,7 +2729,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:2734: checking for $ac_word" >&5 echo "configure:2733: 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
@ -2765,7 +2764,7 @@ fi
min_gtk_version=0.99.13 min_gtk_version=0.99.13
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:2769: checking for GTK - version >= $min_gtk_version" >&5 echo "configure:2768: 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
@ -2788,7 +2787,7 @@ echo "configure:2769: 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 2792 "configure" #line 2791 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@ -2851,7 +2850,7 @@ main ()
} }
EOF EOF
if { (eval echo configure:2855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
: :
else else
@ -2885,7 +2884,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 2889 "configure" #line 2888 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@ -2895,7 +2894,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:2899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2898: \"$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"
@ -2949,17 +2948,17 @@ rm -f conftest*
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:2953: checking for $ac_hdr" >&5 echo "configure:2952: 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 2958 "configure" #line 2957 "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:2963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2962: \"$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*
@ -2989,17 +2988,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:2993: checking for $ac_hdr" >&5 echo "configure:2992: 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 2998 "configure" #line 2997 "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:3003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3002: \"$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*
@ -3037,7 +3036,9 @@ done
echo " you also installed gtk-devel" echo " you also installed gtk-devel"
echo " ===> GUIs will be deactivated" echo " ===> GUIs will be deactivated"
echo "****************************************************************" echo "****************************************************************"
rm -f $cache_file echo ""
echo "you may need to remove $cache_file before you run configure again"
echo ""
else else
BINPROGS=${BINPROGS}" "${GUIPROGS} BINPROGS=${BINPROGS}" "${GUIPROGS}
fi fi

8
configure.in
Wyświetl plik

@ -91,7 +91,9 @@ if test "x${HAVE_SANE}" = "x"; then
echo " - the SANE libraries can't be found because /usr/local/lib/ isn't" echo " - the SANE libraries can't be found because /usr/local/lib/ isn't"
echo " searched by the dynamic linker (see INSTALL for details)" echo " searched by the dynamic linker (see INSTALL for details)"
echo "**********************************************************************" echo "**********************************************************************"
rm -f $cache_file echo ""
echo "you may need to remove $cache_file before you run configure again"
echo ""
exit exit
fi fi
@ -123,7 +125,9 @@ if test "${USE_GUI}" = "yes"; then
echo " you also installed gtk-devel" echo " you also installed gtk-devel"
echo " ===> GUIs will be deactivated" echo " ===> GUIs will be deactivated"
echo "****************************************************************" echo "****************************************************************"
rm -f $cache_file echo ""
echo "you may need to remove $cache_file before you run configure again"
echo ""
else else
BINPROGS=${BINPROGS}" "${GUIPROGS} BINPROGS=${BINPROGS}" "${GUIPROGS}
fi fi