+++ /dev/null
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sane-backends
-PKG_VERSION:=1.0.24
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://fossies.org/linux/misc \
- https://alioth.debian.org/frs/download.php/3958
-PKG_MD5SUM:=1ca68e536cd7c1852322822f5f6ac3a4
-
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=aclocal.m4
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sane-backends/Default
- TITLE:=Scanner Access Now Easy
- URL:=http://www.sane-project.org/
-endef
-
-define Package/sane-backends/Default/description
- SANE (Scanner Access Now Easy) is a universal scanner interface.
-endef
-
-define Package/sane-backends
-$(call Package/sane-backends/Default)
- SECTION:=utils
- CATEGORY:=Utilities
- DEPENDS:=+sane-libs
- TITLE+= (backends)
-endef
-
-define Package/sane-backends/description
-$(call Package/sane-backends/Default/description)
- This package contains the SANE daemon.
-endef
-
-define Package/sane-libs
- $(call Package/sane-backends/Default)
- SECTION:=libs
- CATEGORY:=Libraries
- DEPENDS:=+libjpeg +libtiff +libusb-compat +libv4l +cups
- TITLE+= (libraries)
-endef
-
-define Package/sane-libs/description
-$(call Package/sane-backends/Default/description)
- This package contains the SANE shared libraries.
-endef
-
-define Package/sane-frontends
- $(call Package/sane-backends/Default)
- SECTION:=utils
- CATEGORY:=Utilities
- DEPENDS:=+sane-backends
- TITLE+= (frontends)
-endef
-
-define Package/sane-frontends/description
-$(call Package/sane-backends/Default/description)
- This package contains the SANE frontends.
-endef
-
-TARGET_LDFLAGS += \
- -Wl,-rpath-link $(STAGING_DIR)/usr/lib \
- -Wl,-rpath-link $(PKG_BUILD_DIR)/backend/.libs
-
-CONFIGURE_ARGS+= \
- --enable-shared \
- --enable-static \
- --disable-translations \
- --disable-latex \
- --without-gphoto2 \
- --disable-debug \
- --without-snmp
-
-define Build/Configure
- mkdir -p $(PKG_BUILD_DIR)/backend/.libs
- $(Build/Configure/Default)
-endef
-
-define Package/sane-backends/conffiles
-/etc/sane.d/saned.conf
-endef
-
-define Package/sane-backends/install
- $(INSTALL_DIR) $(1)/etc/sane.d
- $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(1)/etc/sane.d/
- $(INSTALL_DIR) $(1)/usr/sbin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
-endef
-
-define Package/sane-libs/install
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsane.so.* $(1)/usr/lib/
- $(INSTALL_DIR) $(1)/usr/lib/sane
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/sane/libsane-*.so.* $(1)/usr/lib/sane/
-endef
-
-define Package/sane-frontends/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-endef
-
-define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/sane $(1)/usr/include/
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsane.{a,so*} $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,sane-backends))
-$(eval $(call BuildPackage,sane-libs))
-$(eval $(call BuildPackage,sane-frontends))
+++ /dev/null
---- a/configure.in
-+++ b/configure.in
-@@ -82,8 +82,6 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$c
- dnl ***********************************************************************
- dnl set compiler/linker flags
- dnl ***********************************************************************
--INCLUDES="${INCLUDES} -I/usr/local/include"
--AC_SUBST(INCLUDES)
- SANE_SET_CFLAGS([$is_release])
- SANE_SET_LDFLAGS
- SANE_LINKER_RPATH
-@@ -332,30 +330,22 @@ if test -c /dev/urandom ; then
- AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?])
- fi
-
--dnl added by PN 3/2/12 to detect cups
--$as_echo "checking for cups"
--if test -e /usr/include/cups/cups.h ; then
-- AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
-- with_cups="yes"
-- LIBS="-lcups $LIBS"
--else
-- $as_echo "cups.h not found, you may want to install a cups development package"
-- $as_echo "in order to autodetect network scanners in kodakaio."
-- with_cups="no"
-+AC_CHECK_HEADERS([cups/cups.h], [with_cups=yes], [with_cups=no])
-+if test "x${with_cups}" = "xyes"; then
-+ AC_DEFINE(HAVE_CUPS,[1],[Is cups/cups.h available?])
-+ AC_PATH_PROG(CUPS_CONFIG, cups-config)
-+ if test "x${CUPS_CONFIG}" != "x"; then
-+ LIBS="$LIBS `$CUPS_CONFIG --libs`"
-+ fi
- fi
-
--dnl added by llagendijk 12/7/2012 to detect systemd for saned
--$as_echo_n "Checking for systemd..."
--if test -e /usr/include/systemd/sd-daemon.h ; then
-- AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-- with_systemd="yes"
-- SYSTEMD_LIBS=" -lsystemd-daemon"
-- AC_SUBST(SYSTEMD_LIBS)
-- $as_echo "yes"
--else
-- with_systemd="no"
-- $as_echo "no"
-+AC_CHECK_HEADERS([systemd/sd-daemon.h])
-+PKG_CHECK_MODULES([HAVE_SYSTEMD], [libsystemd-daemon], [with_systemd=yes], [with_systemd=no])
-+if test "x${with_systemd}" = "xyes"; then
-+ AC_DEFINE(HAVE_SYSTEMD,[1],[Is systemd/sd-daemon.h available?])
-+ SYSTEMD_LIBS="-lsystemd-daemon"
- fi
-+AC_SUBST(SYSTEMD_LIBS)
-
- dnl ***********
- dnl USB Support