bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sane-backends: update to 1.0.24 and fix configure

Browse Source 
- bump to 1.0.24
	- get rid of shipped libtool
	- remove host include paths from configure macros
	- do not patch generated configure
	- refresh patches

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@39460 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow
2014-02-04 15:32:37 +00:00
parent d236eeea3b
commit 1de539c66a
3 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,55 @@
--- a/configure
+++ b/configure
@@ -5070,9 +5070,6 @@ else
--- 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
-INCLUDES="${INCLUDES} -I/usr/local/include"
-
-
if test "${ac_cv_c_compiler_gnu}" = "yes"; then
NORMAL_CFLAGS="\
-W \
-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