From 0f33dda4113cf5c7d8366b298b041742fb0c74ac Mon Sep 17 00:00:00 2001 From: Oliver Rauch Date: Wed, 15 Nov 2000 22:40:28 +0000 Subject: [PATCH] Added usage of SANE_LDFLAGS and SANE_CFLAGS to acloacal.m4 (sane-test) and sanei/Makfile.in (for #include ) Oliver Rauch --- aclocal.m4 | 3 +++ sanei/Makefile.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/aclocal.m4 b/aclocal.m4 index f0bcf36..c1be111 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -222,8 +222,10 @@ AC_ARG_ENABLE(sanetest, [ --disable-sanetest Do not try to compile and run if test "x$enable_sanetest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" + ac_save_LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS $SANE_CFLAGS" LIBS="$LIBS $SANE_LIBS" + LDFLAGS="$LDFLAGS $SANE_LDFLAGS" dnl dnl Now check if the installed SANE is sufficiently new. (Also sanity dnl checks the results of sane-config to some extent @@ -278,6 +280,7 @@ main () return 1; } ],, no_sane=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + LDFLAGS="$ac_save_LDFLAGS" CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi diff --git a/sanei/Makefile.in b/sanei/Makefile.in index d13a25b..8e26c17 100644 --- a/sanei/Makefile.in +++ b/sanei/Makefile.in @@ -29,7 +29,7 @@ INSTALL_DATA = @INSTALL_DATA@ CC = @CC@ INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include CPPFLAGS = @CPPFLAGS@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ @SANE_CFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ DEFS = @DEFS@