diff --git a/attrib/Makefile.am b/attrib/Makefile.am index 9e6f2a4..d4ea06c 100644 --- a/attrib/Makefile.am +++ b/attrib/Makefile.am @@ -24,5 +24,5 @@ sbin_PROGRAMS = exfatattrib dist_man8_MANS = exfatattrib.8 exfatattrib_SOURCES = main.c exfatattrib_CPPFLAGS = -I$(top_srcdir)/libexfat -exfatattrib_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) -exfatattrib_LDADD = ../libexfat/libexfat.a +exfatattrib_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS) +exfatattrib_LDADD = $(top_srcdir)/libexfat/libexfat.a $(UBLIO_LIBS) diff --git a/configure.ac b/configure.ac index 786cd87..ee62b88 100644 --- a/configure.ac +++ b/configure.ac @@ -31,22 +31,21 @@ AC_PROG_RANLIB AM_PROG_AR AC_SYS_LARGEFILE AC_CANONICAL_HOST -PKG_CHECK_MODULES([UBLIO], [libublio], [ - CFLAGS="$CFLAGS $UBLIO_CFLAGS" - LIBS="$LIBS $UBLIO_LIBS" - AC_DEFINE([USE_UBLIO], [1], - [Define if block devices are not supported.]) -], [:]) PKG_CHECK_MODULES([FUSE3], [fuse3], [AC_DEFINE([FUSE_USE_VERSION], [30], [Required FUSE API version.])], [PKG_CHECK_MODULES([FUSE2], [fuse >= 2.6], [AC_DEFINE([FUSE_USE_VERSION], [26], [Required FUSE API version.])])]) -AC_MSG_CHECKING([whether host-specific defines are needed for $host_os]) +AC_MSG_CHECKING([whether host-specific configuration is needed for $host_os]) case "$host_os" in darwin*) AC_MSG_RESULT([yes]) AC_DEFINE([FUSE_DARWIN_ENABLE_EXTENSIONS], [0], [macFUSE extensions break compatibility with the mainline FUSE.]) ;; + freebsd*) + AC_MSG_RESULT([yes]) + PKG_CHECK_MODULES([UBLIO], [libublio]) + AC_DEFINE([USE_UBLIO], [1], [Define if block devices are not supported.]) + ;; *-gnu) AC_MSG_RESULT([yes]) AC_DEFINE([_XOPEN_SOURCE], [500], [Enable pread() and pwrite().]) diff --git a/dump/Makefile.am b/dump/Makefile.am index e761f4c..5f7e396 100644 --- a/dump/Makefile.am +++ b/dump/Makefile.am @@ -24,5 +24,5 @@ sbin_PROGRAMS = dumpexfat dist_man8_MANS = dumpexfat.8 dumpexfat_SOURCES = main.c dumpexfat_CPPFLAGS = -I$(top_srcdir)/libexfat -dumpexfat_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) -dumpexfat_LDADD = ../libexfat/libexfat.a +dumpexfat_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS) +dumpexfat_LDADD = $(top_srcdir)/libexfat/libexfat.a $(UBLIO_LIBS) diff --git a/fsck/Makefile.am b/fsck/Makefile.am index 4550173..1694564 100644 --- a/fsck/Makefile.am +++ b/fsck/Makefile.am @@ -24,8 +24,8 @@ sbin_PROGRAMS = exfatfsck dist_man8_MANS = exfatfsck.8 exfatfsck_SOURCES = main.c exfatfsck_CPPFLAGS = -I$(top_srcdir)/libexfat -exfatfsck_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) -exfatfsck_LDADD = ../libexfat/libexfat.a +exfatfsck_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS) +exfatfsck_LDADD = $(top_srcdir)/libexfat/libexfat.a $(UBLIO_LIBS) install-exec-hook: ln -sf $(sbin_PROGRAMS) $(DESTDIR)$(sbindir)/fsck.exfat diff --git a/fuse/Makefile.am b/fuse/Makefile.am index 013d307..3eeaab7 100644 --- a/fuse/Makefile.am +++ b/fuse/Makefile.am @@ -24,8 +24,8 @@ sbin_PROGRAMS = mount.exfat-fuse dist_man8_MANS = mount.exfat-fuse.8 mount_exfat_fuse_SOURCES = main.c mount_exfat_fuse_CPPFLAGS = -I$(top_srcdir)/libexfat -mount_exfat_fuse_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) -mount_exfat_fuse_LDADD = ../libexfat/libexfat.a $(FUSE2_LIBS) $(FUSE3_LIBS) +mount_exfat_fuse_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS) +mount_exfat_fuse_LDADD = $(top_srcdir)/libexfat/libexfat.a $(FUSE2_LIBS) $(FUSE3_LIBS) $(UBLIO_LIBS) install-exec-hook: ln -sf $(sbin_PROGRAMS) $(DESTDIR)$(sbindir)/mount.exfat diff --git a/label/Makefile.am b/label/Makefile.am index 0a10a05..612cef1 100644 --- a/label/Makefile.am +++ b/label/Makefile.am @@ -24,5 +24,5 @@ sbin_PROGRAMS = exfatlabel dist_man8_MANS = exfatlabel.8 exfatlabel_SOURCES = main.c exfatlabel_CPPFLAGS = -I$(top_srcdir)/libexfat -exfatlabel_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) -exfatlabel_LDADD = ../libexfat/libexfat.a +exfatlabel_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS) +exfatlabel_LDADD = $(top_srcdir)/libexfat/libexfat.a $(UBLIO_LIBS) diff --git a/libexfat/Makefile.am b/libexfat/Makefile.am index db36fd2..d2ac7ae 100644 --- a/libexfat/Makefile.am +++ b/libexfat/Makefile.am @@ -37,4 +37,4 @@ libexfat_a_SOURCES = \ time.c \ utf.c \ utils.c -libexfat_a_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) +libexfat_a_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS) diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am index bae6272..50d1351 100644 --- a/mkfs/Makefile.am +++ b/mkfs/Makefile.am @@ -39,8 +39,8 @@ mkexfatfs_SOURCES = \ vbr.c \ vbr.h mkexfatfs_CPPFLAGS = -I$(top_srcdir)/libexfat -mkexfatfs_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) -mkexfatfs_LDADD = ../libexfat/libexfat.a +mkexfatfs_CFLAGS = $(FUSE2_CFLAGS) $(FUSE3_CFLAGS) $(UBLIO_CFLAGS) +mkexfatfs_LDADD = $(top_srcdir)/libexfat/libexfat.a $(UBLIO_LIBS) install-exec-hook: ln -sf $(sbin_PROGRAMS) $(DESTDIR)$(sbindir)/mkfs.exfat