From ec30b2a4e6b13a36dbadc0414c287df11a6f20d1 Mon Sep 17 00:00:00 2001 From: Oliver Rauch Date: Wed, 15 Nov 2000 22:58:34 +0000 Subject: [PATCH] Again some changes to acloacal.m4 about sane and SANE_LDFLAGS Oliver Rauch --- configure | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/configure b/configure index df29195..db4362d 100755 --- a/configure +++ b/configure @@ -2756,11 +2756,11 @@ echo "configure:2742: checking for SANE - version >= $min_sane_version" >&5 sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` if test "x$enable_sanetest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" ac_save_LDFLAGS="$LDFLAGS" + ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $SANE_CFLAGS" - LIBS="$LIBS $SANE_LIBS" LDFLAGS="$LDFLAGS $SANE_LDFLAGS" + LIBS="$LIBS $SANE_LIBS" rm -f conf.sanetest if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" @@ -2830,8 +2830,8 @@ fi rm -fr conftest* fi - LDFLAGS="$ac_save_LDFLAGS" CFLAGS="$ac_save_CFLAGS" + LDFLAGS="$ac_save_LDFLAGS" LIBS="$ac_save_LIBS" fi fi @@ -2852,8 +2852,9 @@ fi echo "*** Could not run SANE test program, checking why..." CFLAGS="$CFLAGS $SANE_CFLAGS" LIBS="$LIBS $SANE_LIBS" + LDFLAGS="$LDFLAGS $SANE_LDFLAGS" cat > conftest.$ac_ext < @@ -2863,7 +2864,7 @@ int main() { return ((sane_major_version) || (sane_minor_version) || (sane_micro_version)); ; return 0; } EOF -if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2868: \"$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" @@ -2885,10 +2886,12 @@ else fi rm -f conftest* CFLAGS="$ac_save_CFLAGS" + LDFLAGS="$ac_save_LDFLAGS" LIBS="$ac_save_LIBS" fi fi SANE_CFLAGS="" + SANE_LDFLAGS="" SANE_LIBS="" : fi @@ -2940,7 +2943,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:2944: checking for $ac_word" >&5 +echo "configure:2947: 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 @@ -2975,7 +2978,7 @@ fi min_gtk_version=0.99.13 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:2979: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:2982: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -2998,7 +3001,7 @@ echo "configure:2979: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -3061,7 +3064,7 @@ main () } EOF -if { (eval echo configure:3065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3095,7 +3098,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -3105,7 +3108,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3112: \"$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" @@ -3159,17 +3162,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:3163: checking for $ac_hdr" >&5 +echo "configure:3166: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3176: \"$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* @@ -3199,17 +3202,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3203: checking for $ac_hdr" >&5 +echo "configure:3206: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3216: \"$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* @@ -3435,7 +3438,7 @@ s%@SET_MAKE@%$SET_MAKE%g s%@ALLOCA@%$ALLOCA%g s%@LTALLOCA@%$LTALLOCA%g s%@SANE_CONFIG@%$SANE_CONFIG%g -s%@SANE_LDFLAGS@%$SANE_LDFLAGS%g +s%@SANE_LDLAGS@%$SANE_LDLAGS%g s%@SANE_CFLAGS@%$SANE_CFLAGS%g s%@SANE_LIBS@%$SANE_LIBS%g s%@SANE_PREFIX@%$SANE_PREFIX%g