Added usage of SANE_LDFLAGS and SANE_CFLAGS to acloacal.m4 (sane-test)

and sanei/Makfile.in (for #include <sane.h>)
Oliver Rauch
DEVEL_2_0_BRANCH-1
Oliver Rauch 2000-11-15 22:40:28 +00:00
rodzic 153e75d4d9
commit 0f33dda411
2 zmienionych plików z 4 dodań i 1 usunięć

3
aclocal.m4 vendored
Wyświetl plik

@ -222,8 +222,10 @@ AC_ARG_ENABLE(sanetest, [ --disable-sanetest Do not try to compile and run
if test "x$enable_sanetest" = "xyes" ; then if test "x$enable_sanetest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
ac_save_LDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $SANE_CFLAGS" CFLAGS="$CFLAGS $SANE_CFLAGS"
LIBS="$LIBS $SANE_LIBS" LIBS="$LIBS $SANE_LIBS"
LDFLAGS="$LDFLAGS $SANE_LDFLAGS"
dnl dnl
dnl Now check if the installed SANE is sufficiently new. (Also sanity dnl Now check if the installed SANE is sufficiently new. (Also sanity
dnl checks the results of sane-config to some extent dnl checks the results of sane-config to some extent
@ -278,6 +280,7 @@ main ()
return 1; return 1;
} }
],, no_sane=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ],, no_sane=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
LDFLAGS="$ac_save_LDFLAGS"
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi

Wyświetl plik

@ -29,7 +29,7 @@ INSTALL_DATA = @INSTALL_DATA@
CC = @CC@ CC = @CC@
INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@ @SANE_CFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
DEFS = @DEFS@ DEFS = @DEFS@