diff --git a/Makefile.am b/Makefile.am index d42e9f6..0124fbf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,9 +5,7 @@ AM_CPPFLAGS= -I${srcdir}/lib -D'__COPYRIGHT(x)=' -D'__RCSID(x)=' AM_CPPFLAGS+=-D_BSD_SOURCE AM_CPPFLAGS+=-DMOUNT_NOMAIN AM_CPPFLAGS+=-DINET6 -if ENABLE_SMBFS AM_CPPFLAGS+=-DWITH_SMBFS -endif noinst_HEADERS= fs-utils.h @@ -42,7 +40,6 @@ libfsu_la_SOURCES= lib/fsu_mount.c lib/fsu_alias.c \ lib/stat_flags.c lib/compat.c lib/humanize_number.c lib/strpct.c #libfsu_la_AM_CPPFLAGS= -DMOUNT_NOMAIN -if ENABLE_SMBFS netlibs= -lrumpdev_netsmb -lrumpdev -lrumpkern_crypto libfsu_la_SOURCES+= lib/mount_smbfs.c @@ -53,9 +50,6 @@ libnetsmb_la_SOURCES= lib/smb/cfopt.c lib/smb/file.c lib/smb/mbuf.c \ lib/smb/rcfile.c lib/smb/smb_kernelops.c lib/smb/ctx.c \ lib/smb/kiconv.c lib/smb/nb.c lib/smb/nb_net.c lib/smb/nls.c \ lib/smb/rap.c lib/smb/rq.c lib/smb/subr.c -else -netlibs= -endif AM_CPPFLAGS+=-I${srcdir}/lib/external -DNO_PMAP_CACHE libfsu_la_SOURCES+= lib/mount_nfs.c lib/snprintb.c lib/udp_xfer.c \ @@ -81,9 +75,7 @@ bin_PROGRAMS= fsu_cat fsu_chmod fsu_cp fsu_diff fsu_ecp \ fsu_mkfifo fsu_touch fsu_chown fsu_stat fsu_df binlibs= libfsu.la -if ENABLE_SMBFS binlibs+= libnetsmb.la -endif binlibs+= $(EXTRA_LIBS) $(component_libs) $(netlibs) binlibs+= -lrumpvfs -lrumpdev_disk -lrumpdev -lrump -lrumpuser diff --git a/Makefile.in b/Makefile.in index 8af4c09..c471266 100644 --- a/Makefile.in +++ b/Makefile.in @@ -53,13 +53,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@ENABLE_SMBFS_TRUE@am__append_1 = -DWITH_SMBFS -@ENABLE_SMBFS_TRUE@am__append_2 = lib/mount_smbfs.c -@ENABLE_SMBFS_TRUE@am__append_3 = libnetsmb.la # pick a few popular options if dlopen is not there # XXX: need to handle -Wl,--whole-archive "assistance" from libtool -@STATIC_RUMPKERNEL_TRUE@am__append_4 = -DNO_COMPONENT_DLOPEN +@STATIC_RUMPKERNEL_TRUE@am__append_1 = -DNO_COMPONENT_DLOPEN bin_PROGRAMS = fsu_cat$(EXEEXT) fsu_chmod$(EXEEXT) fsu_cp$(EXEEXT) \ fsu_diff$(EXEEXT) fsu_ecp$(EXEEXT) fsu_exec$(EXEEXT) \ fsu_find$(EXEEXT) fsu_ln$(EXEEXT) fsu_ls$(EXEEXT) \ @@ -68,7 +65,6 @@ bin_PROGRAMS = fsu_cat$(EXEEXT) fsu_chmod$(EXEEXT) fsu_cp$(EXEEXT) \ fsu_chflags$(EXEEXT) fsu_du$(EXEEXT) fsu_mkfifo$(EXEEXT) \ fsu_touch$(EXEEXT) fsu_chown$(EXEEXT) fsu_stat$(EXEEXT) \ fsu_df$(EXEEXT) -@ENABLE_SMBFS_TRUE@am__append_5 = libnetsmb.la subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ @@ -125,19 +121,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" LTLIBRARIES = $(lib_LTLIBRARIES) libfsu_la_LIBADD = -am__libfsu_la_SOURCES_DIST = lib/fsu_mount.c lib/fsu_alias.c \ - lib/mount_cd9660.c lib/mount_ext2fs.c lib/mount_hfs.c \ - lib/mount_msdos.c lib/mount_tmpfs.c lib/mount_efs.c \ - lib/mount_ffs.c lib/mount_lfs.c lib/mount_ntfs.c \ - lib/mount_udf.c lib/mount_sysvbfs.c lib/mount_v7fs.c \ - lib/mount_kernfs.c lib/pathadj.c lib/fattr.c lib/getmntopts.c \ - lib/fsu_fts.c lib/fsu_dir.c lib/fsu_file.c lib/fsu_str2arg.c \ - lib/getbsize.c lib/stat_flags.c lib/compat.c \ - lib/humanize_number.c lib/strpct.c lib/mount_smbfs.c \ - lib/mount_nfs.c lib/snprintb.c lib/udp_xfer.c lib/rpc.c \ - lib/net.c lib/getnfsargs_small.c am__dirstamp = $(am__leading_dot)dirstamp -@ENABLE_SMBFS_TRUE@am__objects_1 = lib/mount_smbfs.lo am_libfsu_la_OBJECTS = lib/fsu_mount.lo lib/fsu_alias.lo \ lib/mount_cd9660.lo lib/mount_ext2fs.lo lib/mount_hfs.lo \ lib/mount_msdos.lo lib/mount_tmpfs.lo lib/mount_efs.lo \ @@ -147,7 +131,7 @@ am_libfsu_la_OBJECTS = lib/fsu_mount.lo lib/fsu_alias.lo \ lib/getmntopts.lo lib/fsu_fts.lo lib/fsu_dir.lo \ lib/fsu_file.lo lib/fsu_str2arg.lo lib/getbsize.lo \ lib/stat_flags.lo lib/compat.lo lib/humanize_number.lo \ - lib/strpct.lo $(am__objects_1) lib/mount_nfs.lo \ + lib/strpct.lo lib/mount_smbfs.lo lib/mount_nfs.lo \ lib/snprintb.lo lib/udp_xfer.lo lib/rpc.lo lib/net.lo \ lib/getnfsargs_small.lo libfsu_la_OBJECTS = $(am_libfsu_la_OBJECTS) @@ -156,27 +140,18 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = libnetsmb_la_LIBADD = -am__libnetsmb_la_SOURCES_DIST = lib/smb/cfopt.c lib/smb/file.c \ - lib/smb/mbuf.c lib/smb/nb_name.c lib/smb/nbns_rq.c \ - lib/smb/print.c lib/smb/rcfile.c lib/smb/smb_kernelops.c \ - lib/smb/ctx.c lib/smb/kiconv.c lib/smb/nb.c lib/smb/nb_net.c \ - lib/smb/nls.c lib/smb/rap.c lib/smb/rq.c lib/smb/subr.c -@ENABLE_SMBFS_TRUE@am_libnetsmb_la_OBJECTS = lib/smb/cfopt.lo \ -@ENABLE_SMBFS_TRUE@ lib/smb/file.lo lib/smb/mbuf.lo \ -@ENABLE_SMBFS_TRUE@ lib/smb/nb_name.lo lib/smb/nbns_rq.lo \ -@ENABLE_SMBFS_TRUE@ lib/smb/print.lo lib/smb/rcfile.lo \ -@ENABLE_SMBFS_TRUE@ lib/smb/smb_kernelops.lo lib/smb/ctx.lo \ -@ENABLE_SMBFS_TRUE@ lib/smb/kiconv.lo lib/smb/nb.lo \ -@ENABLE_SMBFS_TRUE@ lib/smb/nb_net.lo lib/smb/nls.lo \ -@ENABLE_SMBFS_TRUE@ lib/smb/rap.lo lib/smb/rq.lo \ -@ENABLE_SMBFS_TRUE@ lib/smb/subr.lo +am_libnetsmb_la_OBJECTS = lib/smb/cfopt.lo lib/smb/file.lo \ + lib/smb/mbuf.lo lib/smb/nb_name.lo lib/smb/nbns_rq.lo \ + lib/smb/print.lo lib/smb/rcfile.lo lib/smb/smb_kernelops.lo \ + lib/smb/ctx.lo lib/smb/kiconv.lo lib/smb/nb.lo \ + lib/smb/nb_net.lo lib/smb/nls.lo lib/smb/rap.lo lib/smb/rq.lo \ + lib/smb/subr.lo libnetsmb_la_OBJECTS = $(am_libnetsmb_la_OBJECTS) -@ENABLE_SMBFS_TRUE@am_libnetsmb_la_rpath = -rpath $(libdir) PROGRAMS = $(bin_PROGRAMS) am_fsu_cat_OBJECTS = src/fsu_cat.$(OBJEXT) fsu_cat_OBJECTS = $(am_fsu_cat_OBJECTS) am__DEPENDENCIES_1 = -am__DEPENDENCIES_2 = libfsu.la $(am__append_5) $(am__DEPENDENCIES_1) \ +am__DEPENDENCIES_2 = libfsu.la libnetsmb.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) fsu_cat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) am_fsu_chflags_OBJECTS = src/chflags.$(OBJEXT) @@ -295,9 +270,8 @@ SOURCES = $(libfsu_la_SOURCES) $(libnetsmb_la_SOURCES) \ $(fsu_mknod_SOURCES) $(fsu_mv_SOURCES) $(fsu_rm_SOURCES) \ $(fsu_rmdir_SOURCES) $(fsu_stat_SOURCES) $(fsu_touch_SOURCES) \ $(fsu_write_SOURCES) -DIST_SOURCES = $(am__libfsu_la_SOURCES_DIST) \ - $(am__libnetsmb_la_SOURCES_DIST) $(fsu_cat_SOURCES) \ - $(fsu_chflags_SOURCES) $(fsu_chmod_SOURCES) \ +DIST_SOURCES = $(libfsu_la_SOURCES) $(libnetsmb_la_SOURCES) \ + $(fsu_cat_SOURCES) $(fsu_chflags_SOURCES) $(fsu_chmod_SOURCES) \ $(fsu_chown_SOURCES) $(fsu_cp_SOURCES) $(fsu_df_SOURCES) \ $(fsu_diff_SOURCES) $(fsu_du_SOURCES) $(fsu_ecp_SOURCES) \ $(fsu_exec_SOURCES) $(fsu_find_SOURCES) $(fsu_ln_SOURCES) \ @@ -479,8 +453,8 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = -I${srcdir}/lib -D'__COPYRIGHT(x)=' -D'__RCSID(x)=' \ - -D_BSD_SOURCE -DMOUNT_NOMAIN -DINET6 $(am__append_1) \ - -I${srcdir}/lib/external -DNO_PMAP_CACHE $(am__append_4) + -D_BSD_SOURCE -DMOUNT_NOMAIN -DINET6 -DWITH_SMBFS \ + -I${srcdir}/lib/external -DNO_PMAP_CACHE $(am__append_1) noinst_HEADERS = fs-utils.h lib/filesystems.h lib/fsu_alias.h \ lib/fsu_compat.h lib/fsu_fts.h lib/fsu_mount.h lib/fsu_utils.h \ lib/fts2fsufts.h lib/iodesc.h lib/mntopts.h lib/mount_cd9660.h \ @@ -499,7 +473,7 @@ noinst_HEADERS = fs-utils.h lib/filesystems.h lib/fsu_alias.h \ # # lib/ # -lib_LTLIBRARIES = libfsu.la $(am__append_3) +lib_LTLIBRARIES = libfsu.la libnetsmb.la libfsu_la_SOURCES = lib/fsu_mount.c lib/fsu_alias.c lib/mount_cd9660.c \ lib/mount_ext2fs.c lib/mount_hfs.c lib/mount_msdos.c \ lib/mount_tmpfs.c lib/mount_efs.c lib/mount_ffs.c \ @@ -508,23 +482,21 @@ libfsu_la_SOURCES = lib/fsu_mount.c lib/fsu_alias.c lib/mount_cd9660.c \ lib/pathadj.c lib/fattr.c lib/getmntopts.c lib/fsu_fts.c \ lib/fsu_dir.c lib/fsu_file.c lib/fsu_str2arg.c lib/getbsize.c \ lib/stat_flags.c lib/compat.c lib/humanize_number.c \ - lib/strpct.c $(am__append_2) lib/mount_nfs.c lib/snprintb.c \ + lib/strpct.c lib/mount_smbfs.c lib/mount_nfs.c lib/snprintb.c \ lib/udp_xfer.c lib/rpc.c lib/net.c lib/getnfsargs_small.c -@ENABLE_SMBFS_FALSE@netlibs = -lrumpnet_sockin -lrumpnet_net -lrumpnet #libfsu_la_AM_CPPFLAGS= -DMOUNT_NOMAIN -@ENABLE_SMBFS_TRUE@netlibs = -lrumpdev_netsmb -lrumpdev \ -@ENABLE_SMBFS_TRUE@ -lrumpkern_crypto -lrumpnet_sockin \ -@ENABLE_SMBFS_TRUE@ -lrumpnet_net -lrumpnet -@ENABLE_SMBFS_TRUE@libnetsmb_la_SOURCES = lib/smb/cfopt.c lib/smb/file.c lib/smb/mbuf.c \ -@ENABLE_SMBFS_TRUE@ lib/smb/nb_name.c lib/smb/nbns_rq.c lib/smb/print.c \ -@ENABLE_SMBFS_TRUE@ lib/smb/rcfile.c lib/smb/smb_kernelops.c lib/smb/ctx.c \ -@ENABLE_SMBFS_TRUE@ lib/smb/kiconv.c lib/smb/nb.c lib/smb/nb_net.c lib/smb/nls.c \ -@ENABLE_SMBFS_TRUE@ lib/smb/rap.c lib/smb/rq.c lib/smb/subr.c +netlibs = -lrumpdev_netsmb -lrumpdev -lrumpkern_crypto \ + -lrumpnet_sockin -lrumpnet_net -lrumpnet +libnetsmb_la_SOURCES = lib/smb/cfopt.c lib/smb/file.c lib/smb/mbuf.c \ + lib/smb/nb_name.c lib/smb/nbns_rq.c lib/smb/print.c \ + lib/smb/rcfile.c lib/smb/smb_kernelops.c lib/smb/ctx.c \ + lib/smb/kiconv.c lib/smb/nb.c lib/smb/nb_net.c lib/smb/nls.c \ + lib/smb/rap.c lib/smb/rq.c lib/smb/subr.c @STATIC_RUMPKERNEL_FALSE@component_libs = @STATIC_RUMPKERNEL_TRUE@component_libs = -lrumpfs_ffs -lrumpfs_ext2fs -lrumpfs_msdos -lrumpfs_cd9660 -binlibs = libfsu.la $(am__append_5) $(EXTRA_LIBS) $(component_libs) \ +binlibs = libfsu.la libnetsmb.la $(EXTRA_LIBS) $(component_libs) \ $(netlibs) -lrumpvfs -lrumpdev_disk -lrumpdev -lrump \ -lrumpuser fsu_cat_SOURCES = src/fsu_cat.c @@ -762,7 +734,7 @@ lib/smb/rq.lo: lib/smb/$(am__dirstamp) \ lib/smb/subr.lo: lib/smb/$(am__dirstamp) \ lib/smb/$(DEPDIR)/$(am__dirstamp) libnetsmb.la: $(libnetsmb_la_OBJECTS) $(libnetsmb_la_DEPENDENCIES) $(EXTRA_libnetsmb_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(am_libnetsmb_la_rpath) $(libnetsmb_la_OBJECTS) $(libnetsmb_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libnetsmb_la_OBJECTS) $(libnetsmb_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ diff --git a/configure b/configure index 99f6a7f..03db47f 100755 --- a/configure +++ b/configure @@ -640,8 +640,6 @@ LINKER_NO_AS_NEEDED STATIC_RUMPKERNEL_FALSE STATIC_RUMPKERNEL_TRUE EXTRA_LIBS -ENABLE_SMBFS_FALSE -ENABLE_SMBFS_TRUE WRAP_LCHMOD CPP OTOOL64 @@ -776,7 +774,6 @@ with_gnu_ld with_libtool_sysroot enable_libtool_lock enable_largefile -enable_smbfs ' ac_precious_vars='build_alias host_alias @@ -1421,7 +1418,6 @@ Optional Features: optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --disable-largefile omit support for large files - --enable-smbfs Enable SMB File System Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -12529,22 +12525,6 @@ _ACEOF fi -# Check whether --enable-smbfs was given. -if test "${enable_smbfs+set}" = set; then : - enableval=$enable_smbfs; enable_smbfs=true -else - enable_smbfs=false -fi - - if test x$enable_smbfs = xtrue; then - ENABLE_SMBFS_TRUE= - ENABLE_SMBFS_FALSE='#' -else - ENABLE_SMBFS_TRUE='#' - ENABLE_SMBFS_FALSE= -fi - - EXTRA_LIBS="" case $target_os in #( linux*) : @@ -12726,10 +12706,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_SMBFS_TRUE}" && test -z "${ENABLE_SMBFS_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_SMBFS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${STATIC_RUMPKERNEL_TRUE}" && test -z "${STATIC_RUMPKERNEL_FALSE}"; then as_fn_error $? "conditional \"STATIC_RUMPKERNEL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index 3f8b7ea..ff2bd67 100644 --- a/configure.ac +++ b/configure.ac @@ -64,11 +64,6 @@ AC_CHECK_MEMBERS([struct stat.st_gen],,,[#include ]) AC_CHECK_MEMBERS([struct sockaddr.sa_len],,,[#include ]) AC_CHECK_MEMBERS([struct sockaddr_in.sin_len],,,[#include ]) -AC_ARG_ENABLE([smbfs], - [ --enable-smbfs Enable SMB File System], - [enable_smbfs=true],[enable_smbfs=false]) -AM_CONDITIONAL([ENABLE_SMBFS], [test x$enable_smbfs = xtrue]) - EXTRA_LIBS="" AS_CASE([$target_os], [linux*], [EXTRA_LIBS="-lrumpnet_sockin -lrumpnet_net -lrumpnet -lrumpkern_sys_linux"],