1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From: Helmut Grohne <helmut@subdivi.de>
Date: Mon, 26 Nov 2018 21:54:16 +0100
X-Dgit-Generated: 1.0.0-7 c9b86971ef392ee75888c01ef0b4f2ea542cd292
Subject: Fix: FTCBFS: uses the wrong pkg-config (Closes: #914739)
---
--- rdiff-backup-fs-1.0.0.orig/configure.ac
+++ rdiff-backup-fs-1.0.0/configure.ac
@@ -15,7 +15,7 @@ AC_PROG_CC
dnl checks for libraries
AC_CHECK_LIB([z], [gzgets],,[AC_MSG_ERROR(No zlib library!)])
-AC_CHECK_LIB(fuse, fuse_main, FUSE_LIBS="-lfuse", AC_MSG_ERROR(No fuse library!))
+PKG_CHECK_MODULES([FUSE],[fuse])
dnl checks for header files
@@ -46,12 +46,12 @@ AC_TYPE_SIZE_T
dnl checking type of system to provide proper compile and linking flags
case ${host} in
- *-*-linux-*|*-*-k*bsd*-*) AC_SUBST(CFLAGS, ["$EXTRA_CFLAGS -Wall -g -O3 `pkg-config --cflags fuse`"])
- AC_SUBST(LIBS, ["$LIBS $EXTRA_CFLAGS `pkg-config --cflags --libs fuse` -lz"]);;
- *-*-bsd-*) AC_SUBST(CFLAGS, ["-Wall -g -O3 `pkg-config --cflags fuse`"])
- AC_SUBST(LIBS, ["$LIBS `pkg-config --cflags --libs fuse` -lz"]);;
- *-*-darwin*) AC_SUBST(CFLAGS, ["-Wall -g -O3 `pkg-config --cflags fuse`"])
- AC_SUBST(LIBS, ["$LIBS `pkg-config --cflags --libs fuse` -lz"]);;
+ *-*-linux-*|*-*-k*bsd*-*) AC_SUBST(CFLAGS, ["$EXTRA_CFLAGS -Wall -g -O3 $FUSE_CFLAGS"])
+ AC_SUBST(LIBS, ["$LIBS $EXTRA_CFLAGS $FUSE_CFLAGS $FUSE_LIBS -lz"]);;
+ *-*-bsd-*) AC_SUBST(CFLAGS, ["-Wall -g -O3 $FUSE_CFLAGS"])
+ AC_SUBST(LIBS, ["$LIBS $FUSE_CFLAGS $FUSE_LIBS -lz"]);;
+ *-*-darwin*) AC_SUBST(CFLAGS, ["-Wall -g -O3 $FUSE_CFLAGS"])
+ AC_SUBST(LIBS, ["$LIBS $FUSE_CFLAGS $FUSE_LIBS -lz"]);;
*) AC_MSG_WARN(No automatic flags for this host system; set compile/linking flags manually);;
esac
|
