Commit Graph

82 Commits

Author SHA1 Message Date
Andrew Borodin
bcb8c376ef Portability: use g_ascii_strtoll instead of strtoll, atoll and atof.
Set minimal version of GLib up to 2.12 because of g_ascii_strtoll.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-21 12:50:32 +04:00
Andrew Borodin
d557ade7f6 PCRE_CFLAGS are CPPFLAGS, actually.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-18 16:32:52 +04:00
Andrew Borodin
36c73a00e7 m4.include/mc-with-screen-slang.m4: clarify usage of CPPFLAGS, CFLAGS and LDFLAGS
...in s-lang library checking.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-18 16:32:08 +04:00
Andrew Borodin
a67d752ef2 Ticket #2926: fail to check ncurses library
...if --with-ncurses-inc and --with-ncurses-libs options are used.

m4.include/mc-with-screen-ncurses.m4: clarify usage of LDFLAGS in
ncurses library checking: add $ac_curses_lib_path.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-12-18 16:32:08 +04:00
Andrew Borodin
2209738d1a Ticket #2918: cygwin test failure.
In
tests/lib/mcconfig/Makefile.am
tests/lib/vfs/Makefile.am
tests/src/filemanager/Makefile.am

AM_LDFLAGS = -Wl,-z,muldefs

is used, but on cygwin the linker does not accept the "-z" option and

AM_LDFLAGS = -Wl,--allow-multiple-definition

is required instead.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-11-14 13:35:47 +04:00
Andrew Borodin
38b35288f9 Sync with gnulib 0a6dafee2bb8f69a931345a1f67d835ee5062967
Avoid needless check on GNU/Linux.

* m4.include/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Omit STAT_STATFS3_OSF1 check
on GNU/Linux systems, since it can't possibly work.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 14:06:03 +04:00
Andrew Borodin
77b2392aa0 Sync with gnulib b1fac377605c0eef8844fc8d3818d360f37d6fa4:
fs usage: fix block size returned on older Linux 2.6.

* src/filemanager/mountlist.c: Fall back to (struct statfs).f_frsize
which is available since Linux 2.6.
* m4.include/fsusage.m4 (STAT_STATFS2_FRSIZE): Always define
when the member is available so it can be used as a fallback.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 14:06:03 +04:00
Andrew Borodin
c9f439efe3 Ticket #2906: crash on Solaris while trying to copy a file.
Sync with gnulib c25bdbae48977a527dff69150f59fb0746d31b51:
fs usage: check for GNU/Linux statvfs problem dynamically.

* src/filemanager/mountlist.c [STAT_STATVFS && __linux__ && (__GLIBC__||__UCLIBC__)]:
Define STAT_STATFS2_BSIZE too, since in this case the code now
checks dynamically whether statvfs is reliable, falling back on
Linux-style statfs otherwise.
(statvfs_works): New function, for dynamically testing statvfs.
(get_fs_usage) [STAT_STATVFS]: Use it.
* src/filemanager/filegui.c (filegui__check_attrs_on_fs): apply the same
statvfs_works function.
* m4.include/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Remove static check for
statvfs on GNU/Linux hosts, since it's now done dynamically.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-10-12 14:06:02 +04:00
Andrew Borodin
7d281e071f Cleanup of screen library detection m4 code.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-09-06 13:25:02 +04:00
Andrew Borodin
32651f22f6 Sync with gnulib 06b335ade65c8fe60fee8b9e18b670bb54ed924a:
Write "Mac OS X" instead of "MacOS X".

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-17 17:07:31 +04:00
Andrew Borodin
2140592acb Ticket #2825: obtain FS name from stat info: sync with coreutils.
src/filemanager/filegui.c does not compile on Solaris due to missing macros.
AVE_STRUCT_STATVFS_F_BASETYPE and HAVE_STRUCT_STATVFS_F_FSTYPENAME macros
are not set or even defined in config.h. configure scrips does not even
check for those members.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-07-02 20:53:14 +04:00
Sergei Trofimovich
52df780eb6 ./configure: cleanup '--enable-background' option description
Before the patch ./configure --help shown:
  --enable-background     Support for background file operations [[yes]]

After the patch:
  --enable-background     Support for background file operations [yes]

Changed whitespace: converted tabs to spaces.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
2012-06-22 17:18:59 +03:00
Andrew Borodin
b80864431c Tweak background operations support.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2012-03-19 13:34:21 +03:00
Egmont Koblinger
a6ca3c2899 Ticket #2689 (fix fallocate detection for xBSD)
fixed macros 'mc-get-fs-info.m4' for correct 'fallocate' detection under xBSD

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
2012-01-19 17:13:14 +04:00
Andrew Borodin
e7e3a119b4 src/filemanager/mountlist.c and related m4 macros: sync with gnulib.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-10-28 11:26:54 +04:00
Slava Zanko
7fbdb87805 Ticket #2610: Use posix_fallocate() when copying files/moving to a new mount point
Added m4 function for check if posix_fallocate() is present.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-10-20 10:50:24 +03:00
Jindrich Makovicka
bd5348591f Ticket #2589: fix autoconf warning
Recent autoconf displays warnings about missing AC_LANG_SOURCE.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-08-11 13:05:57 +04:00
Andrew Borodin
ad9f03da69 Get rid of obsolete form of AC_CHECK_TYPE macro.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-07-07 13:04:00 +04:00
Andrew Borodin
4358a4e898 Ticket #2560: get rid of autoconf obsolete macros.
Use AS_HELP_STRING instead of AC_HELP_STRING.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2011-07-07 13:03:21 +04:00
Slava Zanko
48d1f1f518 configure.ac: Moved GLib initialization to m4.include/ac-glib.m4
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-03-21 23:55:53 +02:00
Slava Zanko
6c5f5bf768 VFS structure changes:
* moved from lib/vfs/mc-vfs to lib/vfs;
  * split by directories for VFS-plugins and moved to src/vfs;
  * lib/vfs/vfs-impl.h was merged into lib/vfs/vfs.h.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-03-21 11:48:26 +02:00
Slava Zanko
fc7142d2a0 Ticket #2501: 'lib' should be independ to 'src' directory
Added base support for unit tests (see http://check.sourceforge.net/ for details).

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2011-03-21 10:30:27 +02:00
Andrew Borodin
72ee546a59 Ticket #2419: configure script doesn't set samba configdir.
lib/vfs/mc-vfs/samba/configure can't set the value of SAMBA_CFLAGS
in lib/vfs/mc-vfs/Makefile.am.

The solution: to avoid configuration code duplication, use environment
variables SMBCONFIGDIR and SMBCODEPAGEDIR to set up values of configdir
and codepagedir variables in lib/vfs/mc-vfs/samba/Makefile because
samba configure is child process of main configure.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-12-03 15:36:47 +03:00
Slava Zanko
1914a54555 Extended list of GCC warning flags.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-12-03 10:59:23 +03:00
Andrew Borodin
62c05d62f3 Ticket #2409: fix of GModule detection and usage.
Don't mix GLib and GModule compiler and linker options.

Use gmodule-no-export if present to avoid use -Wl,--export-dynamic
option with some linkers. If gmodule-no-export is not available,
use generic gmodule.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-12-02 21:59:42 +03:00
Andrew Borodin
e1d7019ed3 Ticket #2137: cannot change panel encoding without VFS support
Initial step: fixed processing of --enable-vfs* options.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-09-27 21:43:43 +04:00
Andrew Borodin
da8e14bcbb Define ENABLE_VFS_NET in C code not in M4 one.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-24 09:27:27 +04:00
Andrew Borodin
965e9d6bff Fixed default behavior of --enable-vfs-undelfs option.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-24 09:27:27 +04:00
Andrew Borodin
5b8b72b067 Run samba configure script if --enable-vfs-smb option is used.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-24 09:27:27 +04:00
Andrew Borodin
4dcc1148a3 Don't check samba options in main configure.
They are checked in the Samba configure script.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-24 09:26:28 +04:00
Andrew Borodin
ae50b78314 Ticket #1818: configure of samba VFA runs unconditionally.
Disable Smb VFS by default.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-24 09:26:28 +04:00
Andrew Borodin
11c00959f3 Fixup of conditions for networking VFS.
Clean up of code duplicate in configure.ac.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-21 16:43:50 +04:00
Slava Zanko
12446899f7 Changes for configure and build with samba:
* m4: AC_CONFIG_SUBDIRS() macros should be always called without relation to enable/disable samba support
 * vfs/samba: configure.ac: renamed --with-configdir to --with-smb-configdir
 * vfs/samba: configure.ac: renamed --with-codepagedir to --with-smb-codepagedir

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-07-21 16:43:50 +04:00
Enrico Weigelt, metux IT service
9b89d60522 VFS: cleaned up smbfs.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-07-21 16:43:50 +04:00
Enrico Weigelt, metux IT service
67d6ebfd16 VFS: fishfs can now be switched off
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-21 16:43:50 +04:00
Enrico Weigelt, metux IT service
05516fbac8 VFS: ftpfs can now be switched off
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-21 16:43:50 +04:00
Enrico Weigelt, metux IT service
bc1de7cd78 VFS: extfs can now be switched off
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-21 16:43:50 +04:00
Enrico Weigelt, metux IT service
6f289617d2 VFS: sfs can now be switched off
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-21 16:43:50 +04:00
Enrico Weigelt, metux IT service
f33f7a5031 VFS: tarfs can now be switched off
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-21 16:43:50 +04:00
Enrico Weigelt, metux IT service
19390ab2d7 VFS: cpiofs can now be switched off
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-21 16:43:50 +04:00
Slava Zanko
57b980ccb9 undelfs now switched off by default
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-21 16:43:50 +04:00
Enrico Weigelt, metux IT service
5df06e7630 VFS: fixups of UNDELFS VFS switch on/off.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-21 16:43:50 +04:00
Slava Zanko
3ef8854036 Bug: if VFS is disabled, perl is not checked and man2hlp doesn't work.
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-07-21 16:43:49 +04:00
Andrew Borodin
d0de39bcde Ticket #1818: refactoring of VFS building options.
Initial step: removed MVFS references. MVFS is not supported.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-21 16:43:49 +04:00
Andrew Borodin
6a55c9320e Ticket #2279: mcserver is deprecated.
Removed mcserver and mcfs support.

Reasons:
(1) no longer builds
(2) no one is willing to support it
(3) possibly contains unfixed security holes
(4) makes no sense in view of the availability of FISH

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-07-17 18:36:54 +04:00
Slava Zanko
e07b5598da Fixed broken compile if slang.pc file present in ${libdir}/pkgconfig
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-06-16 10:42:56 +03:00
Slava Zanko
863291ddcd Ticket #1959: Broken master branch after 'AC_TRY_RUN crosscompile break' patch
* split m4.include/mc-with-screen.m4 file in two files: mc-with-screen-slang.m4 and mc-with-screen.m4

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-06-16 10:42:45 +03:00
Slava Zanko
da583e5739 Ticket #1959: AC_TRY_RUN crosscompile break
We have several AC_TRY_RUN's in the configure/m4 stuff,
which obviously breaks crosscompiling.

This changeset contain fixies for S-Lang library. First try to search
library via 'pkg-config slang' and then try to go in old search way.
Macro AC_TRY_RUN() now replaced by AC_RUN_IFELSE()

Also, next changes was made:
 * Removed AC_TRY_RUN() from gmodule checking code.
 * More accuracy in grepping of SLANG_VERSION defined constant
 * avoid autoconf error 'suspicious presence of an AC_DEFINE in the second argument, where no actions should be taken'

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2010-06-14 12:44:29 +03:00
Andrew Borodin
efa29d7cc7 Fixed messages of PCRE check.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2010-05-05 16:24:14 +04:00
Enrico Weigelt, metux IT service
a295a9df47 Ticket #1925: Fixed conditional compile of mcserver 2010-01-27 21:56:46 +01:00