utils/sane-backends/patches/010-dont-add-host-include-path.patch

   1 --- a/configure.in
   2 +++ b/configure.in
   3 @@ -82,8 +82,6 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$c
   4  dnl ***********************************************************************
   5  dnl set compiler/linker flags
   6  dnl ***********************************************************************
   7 -INCLUDES="${INCLUDES} -I/usr/local/include"
   8 -AC_SUBST(INCLUDES)
   9  SANE_SET_CFLAGS([$is_release])
  10  SANE_SET_LDFLAGS
  11  SANE_LINKER_RPATH
  12 @@ -332,30 +330,22 @@ if test -c /dev/urandom ; then
  13      AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?])
  14  fi
  15
  16 -dnl added by PN 3/2/12 to detect cups
  17 -$as_echo "checking for cups"
  18 -if test -e /usr/include/cups/cups.h ; then
  19 -    AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
  20 -       with_cups="yes"
  21 -       LIBS="-lcups  $LIBS"
  22 -else
  23 -       $as_echo "cups.h not found, you may want to install a cups development package"
  24 -       $as_echo "in order to autodetect network scanners in kodakaio."
  25 -       with_cups="no"
  26 +AC_CHECK_HEADERS([cups/cups.h], [with_cups=yes], [with_cups=no])
  27 +if test "x${with_cups}" = "xyes"; then
  28 +  AC_DEFINE(HAVE_CUPS,[1],[Is cups/cups.h available?])
  29 +  AC_PATH_PROG(CUPS_CONFIG, cups-config)
  30 +  if test "x${CUPS_CONFIG}" != "x"; then
  31 +    LIBS="$LIBS `$CUPS_CONFIG --libs`"
  32 +  fi
  33  fi
  34
  35 -dnl added by llagendijk 12/7/2012 to detect systemd for saned
  36 -$as_echo_n "Checking for systemd..."
  37 -if test -e /usr/include/systemd/sd-daemon.h ; then
  38 -    AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
  39 -    with_systemd="yes"
  40 -    SYSTEMD_LIBS=" -lsystemd-daemon"
  41 -    AC_SUBST(SYSTEMD_LIBS)
  42 -    $as_echo "yes"
  43 -else
  44 -    with_systemd="no"
  45 -    $as_echo "no"
  46 +AC_CHECK_HEADERS([systemd/sd-daemon.h])
  47 +PKG_CHECK_MODULES([HAVE_SYSTEMD], [libsystemd-daemon], [with_systemd=yes], [with_systemd=no])
  48 +if test "x${with_systemd}" = "xyes"; then
  49 +    AC_DEFINE(HAVE_SYSTEMD,[1],[Is systemd/sd-daemon.h available?])
  50 +    SYSTEMD_LIBS="-lsystemd-daemon"
  51  fi
  52 +AC_SUBST(SYSTEMD_LIBS)
  53
  54  dnl ***********
  55  dnl USB Support