[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#914739: rdiff-backup-fs FTCBFS: uses the wrong pkg-config



Source: rdiff-backup-fs
Version: 1.0.0-5
Tags: patch upstream
User: helmutg@debian.org
Usertags: rebootstrap

rdiff-backup-fs fails to cross build from source, because configure.ac
hard codes the build architecture pkg-config. The attached patch makes
it use PKG_CHECK_MODULES, which automatically picks up the right
pkg-config, and makes rdiff-backup-fs cross build successfully. Please
consider applying it.

Helmut
--- rdiff-backup-fs-1.0.0.orig/configure.ac
+++ rdiff-backup-fs-1.0.0/configure.ac
@@ -15,7 +15,7 @@
 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 @@
 dnl checking type of system to provide proper compile and linking flags
 
 case ${host} in
-    *-*-linux-*|*-*-k*bsd*-*)	AC_SUBST(CFLAGS, ["-Wall -g -O3 `pkg-config --cflags fuse`"])
-			AC_SUBST(LIBS, ["$LIBS `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, ["-Wall -g -O3 $FUSE_CFLAGS"])
+			AC_SUBST(LIBS, ["$LIBS $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
 

Reply to: