[sane-devel] [PATCH v2] Do not use STRINGIFY for LIBDIR but pass "LIBDIR" from build system

2015-06-10 Thread Niels Ole Salscheider
Otherwise, "linux" will be expanded to "1" when it is stringified. This is a problem for e. g. LIBDIR, which might contain a target triplet. On my system, /usr/x86_64-pc-linux-gnu-gcc would expand to x86_64-pc-1-gnu-gcc. v2: also adjust backend/Makefile.in --- backend/Makefile.am | 2 +- backend

Re: [sane-devel] [PATCH] undef linux before defining STRINGIFY

2015-06-10 Thread Niels Ole Salscheider
On Wednesday 10 June 2015, 08:38:53, Olaf Meeuwissen wrote: > Olaf Meeuwissen writes: > > Niels Ole Salscheider writes: > >> Am 2015-06-09 14:21, schrieb m. allan noah: > >>> We need more info here. Where do you see this expansion problem? > >>> > &g

[sane-devel] [PATCH] Do not use STRINGIFY for LIBDIR but pass "LIBDIR" from build system

2015-06-10 Thread Niels Ole Salscheider
Otherwise, "linux" will be expanded to "1" when it is stringified. This is a problem for e. g. LIBDIR, which might contain a target triplet. On my system, /usr/x86_64-pc-linux-gnu-gcc would expand to x86_64-pc-1-gnu-gcc. --- backend/Makefile.am | 2 +- backend/dll.c | 6 +++--- 2 files chan

Re: [sane-devel] [PATCH] undef linux before defining STRINGIFY

2015-06-09 Thread Niels Ole Salscheider
t find any backends. Ole On Sun, Jun 7, 2015 at 4:14 PM, Niels Ole Salscheider wrote: Otherwise, "linux" will be expanded to "1" when it is stringified. This is a problem for e. g. LIBDIR, which might contain a target triplet. On my system, /usr/x86_64-pc-linux-gnu-

[sane-devel] [PATCH] undef linux before defining STRINGIFY

2015-06-09 Thread Niels Ole Salscheider
Otherwise, "linux" will be expanded to "1" when it is stringified. This is a problem for e. g. LIBDIR, which might contain a target triplet. On my system, /usr/x86_64-pc-linux-gnu-gcc would expand to x86_64-pc-1-gnu-gcc. --- include/sane/sanei.h | 3 +++ 1 file changed, 3 insertions(+) diff --gi

Re: [sane-devel] [PATCH] dll: Use STRINGIFY1 instead of STRINGIFY

2015-06-06 Thread Niels Ole Salscheider
Please ignore this patch, it does not work either. I will try to find a working solution. On Friday 05 June 2015, 21:14:02, Niels Ole Salscheider wrote: > Otherwise, LIBDIR is expanded which breaks the path. E. g. "linux" > is replaced by "1" in x86_64-pc-linux-gnu.

[sane-devel] [PATCH] dll: Use STRINGIFY1 instead of STRINGIFY

2015-06-05 Thread Niels Ole Salscheider
Otherwise, LIBDIR is expanded which breaks the path. E. g. "linux" is replaced by "1" in x86_64-pc-linux-gnu. --- backend/dll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/dll.c b/backend/dll.c index 619ee55..13d14f6 100644 --- a/backend/dll.c +++ b/backend/dl

[sane-devel] [PATCH] Make sure that systemd detection works even without --enable-compat-libs

2015-02-04 Thread Niels Ole Salscheider
This patch is from Gentoo: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch?revision=1.2&view=markup --- configure.in | 25 +++-- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/co

[sane-devel] [PATCH] Do not automatically detect systemd

2015-02-04 Thread Niels Ole Salscheider
Instead, add a --with-systemd flag to the configure script that can be used to enable or disable systemd support. This patch is from Gentoo: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch?revision=1.1&view=markup -