diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2023-02-19 12:08:06 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2023-02-19 12:08:06 +0100 |
| commit | 391c0b7a3978d5aca246d6a62a639edaaa6eb249 (patch) | |
| tree | ae2888edfcb04e8211b8e95857d5ed58740b9cd8 /debian/patches | |
| parent | c4ded0937770f04453d0aed281e440f2a4c88068 (diff) | |
| parent | bd3bc37eff5a876090778b2dceb24b774116e61d (diff) | |
Merge branch 'release/debian/1.0.14-17'debian/1.0.14-17
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0001-fix_missing_sane-config.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/debian/patches/0001-fix_missing_sane-config.patch b/debian/patches/0001-fix_missing_sane-config.patch index 8804be0..2240cba 100644 --- a/debian/patches/0001-fix_missing_sane-config.patch +++ b/debian/patches/0001-fix_missing_sane-config.patch @@ -2,20 +2,19 @@ Description: Fix FTBFS against libsane-dev >= 1.0.25-3 Fix missing sane-config Author: Andreas Metzler <ametzler@bebt.de> Reviewed-by: Jörg Frings-Fürst <debian@jff-webhosting.net> -Last-Update: 2017-01-28 +Last-Update: 2023-02-17 Index: trunk/configure.in =================================================================== --- trunk.orig/configure.in +++ trunk/configure.in -@@ -112,7 +112,10 @@ fi +@@ -112,7 +112,9 @@ fi AC_CHECK_TOOL(RANLIB, ranlib, :) -AM_PATH_SANE(1.0.0, HAVE_SANE=yes, ) -+PKG_CHECK_MODULES([SANE], [sane-backends >= 1.0.0]) ++PKG_CHECK_MODULES([SANE], [sane-backends >= 1.0.0], [HAVE_SANE=yes]) +PKG_CHECK_VAR([SANE_PREFIX], [sane-backends >= 1.0.0], [prefix]) -+PKG_CHECK_VAR([SANE_LDFLAGS], [sane-backends >= 1.0.0], [ldflags], -+ [HAVE_SANE=yes]) ++PKG_CHECK_VAR([SANE_LDFLAGS], [sane-backends >= 1.0.0], [ldflags]) dnl Print error message if sane is missing if test "x${HAVE_SANE}" = "x"; then echo "**********************************************************************" |