Репозитории ALT
Группа :: Коммуникации
Пакет: fuse-siefs
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: siefs-0.5-alt-fuse-pkgconfig.patch
Скачать
Скачать
--- siefs-0.5/siefs/siefs.c.alt-fuse-pkgconfig 2005-04-05 18:31:12 +0400
+++ siefs-0.5/siefs/siefs.c 2005-04-17 15:35:42 +0400
@@ -7,7 +7,7 @@
See the file COPYING.
*/
-#include <fuse/fuse.h>
+#include <fuse.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -29,8 +29,6 @@
#define SIEFS_GET 1
#define SIEFS_PUT 2
-#define MOUNTPROG FUSEINST "/bin/fusermount"
-
static obexsession *g_os;
static char *comm_device;
static char *g_iocharset = "utf8";
@@ -604,7 +602,6 @@ void parse_options(char *p)
int main(int argc, char *argv[])
{
- char *mountprog = MOUNTPROG;
char **fuse_argv = (char **) malloc(3 + argc + 1);
char *p, *pp, *env_path;
int i, j, path_size;
@@ -691,13 +688,6 @@ int main(int argc, char *argv[])
atexit(cleanup);
- env_path = getenv("PATH");
- path_size = env_path ? strlen(env_path) : 0;
- p = malloc(path_size + strlen(FUSEINST) + 7);
- sprintf(p, "%s:%s/bin", env_path ? env_path : "", FUSEINST);
- setenv("PATH", p, 1);
- free(p);
-
fuse_argv[0] = argv[0];
fuse_argv[1] = mntpoint;
fuse_argv[2] = NULL;
--- siefs-0.5/siefs/Makefile.am.alt-fuse-pkgconfig 2005-04-05 18:36:28 +0400
+++ siefs-0.5/siefs/Makefile.am 2005-04-17 15:35:42 +0400
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-CFLAGS = -I$(fuseinst)/include -DFUSEINST="\"$(fuseinst)\"" -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=22
+CFLAGS = @FUSE_CFLAGS@ -DFUSE_USE_VERSION=22
bin_PROGRAMS = siefs slink
@@ -9,7 +9,7 @@ siefs_SOURCES = siefs.c obex.c obex.h tr
slink_SOURCES = slink.c obex.c obex.h transport.c transport.h comm.c comm.h \
crcmodel.c crcmodel.h
-LDADD = $(fuseinst)/lib/libfuse.a -lpthread
+LDADD = @FUSE_LIBS@ -lpthread
install-exec-hook:
-rm -f /sbin/mount.siefs
--- siefs-0.5/configure.in.alt-fuse-pkgconfig 2005-04-04 09:15:31 +0400
+++ siefs-0.5/configure.in 2005-04-17 15:35:42 +0400
@@ -12,48 +12,11 @@ AC_SUBST(LD)
CFLAGS="-Wall -W -g -O2"
-AC_ARG_WITH(fuse,
- [ --with-fuse=DIR specify location of fuse],
- [fuseinst="$withval"])
-
-CPPFLAGS="$CPPFLAGS -I${fuseinst}/include"
-LDFLAGS="$LDFLAGS -L${fuseinst}/lib"
-
-AC_MSG_CHECKING([fuse installation])
-if test -z "$fuseinst" ; then
- for d in /usr /usr/local /opt ; do
- if test -f $d/include/fuse/fuse.h ; then
- fuseinst=$d
- break
- fi
- done
-fi
-
-if ! test -f $fuseinst/include/fuse/fuse.h ; then
- AC_MSG_RESULT([Not found])
- AC_MSG_ERROR([
-*** Please specify the location of the fuse with
-*** the '--with-fuse=DIR' option.
-*** You can download latest version of fuse
-*** at http://sourceforge.net/projects/fuse
-])
-fi
-
-if ! grep -q '\(\*release\)' $fuseinst/include/fuse/fuse.h ; then
- AC_MSG_RESULT([old])
- AC_MSG_ERROR([
-*** You need fuse version 2.0 or later.
-*** Please go to http://sourceforge.net/projects/fuse
-*** and download the latest version
-])
-fi
-AC_MSG_RESULT(${fuseinst})
-AC_SUBST(fuseinst)
+PKG_CHECK_MODULES(FUSE, fuse >= 2.2)
subdirs="siefs converter"
AC_SUBST(subdirs)
-AC_DEFINE_UNQUOTED(FUSEINST, "${fuseinst}")
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(PREFIX, "${ac_default_prefix}")
else