mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1423_FreeBSD_Slang_not_found' 

* 1423_FreeBSD_Slang_not_found:
  Removed unneded check for iconv functions. MC use glib functions for
  Fixed test conditions in m4 files for more compability
  Add support of csh (used on FreeBSD)
  Ticket #1423 (Fail to compile with option '--with-screen=slang')
This commit is contained in:
Slava Zanko 2009-07-27 13:50:12 +03:00
parent 0654b48201 fb52d1661e
commit b069c3b8bd
22 changed files with 238 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -498,14 +498,10 @@ AC_ARG_ENABLE([charset],
have_charset=
charset_msg="no"
if test "x$enable_charset" = xyes; then
if test "x$am_cv_func_iconv" != xyes; then
AC_MSG_WARN([Cannot enable charset support because iconv function is missing])
else
AC_DEFINE(HAVE_CHARSET, 1,
[Define to enable charset selection and conversion])
have_charset=yes
charset_msg="yes"
fi
fi
if test "$GLIBC21" != yes; then

2
m4.include/ac-g-module-supported.m4
View File

@ -26,7 +26,7 @@ int main ()
LIBS="$ac_save_LIBS"
])
if test "$mc_cv_g_module_supported" = yes; then
if test x"$mc_cv_g_module_supported" = xyes; then
AC_DEFINE(HAVE_GMODULE, 1,
[Define if gmodule functionality is supported])
fi

90
m4.include/ac-get-fs-info.m4
View File

@ -76,7 +76,7 @@ AC_FUNC_GETMNTENT
# I think there is too great a chance that some non-Cray system has a
# function named listmntent to risk the false positive.
if test -z "$ac_list_mounted_fs"; then
if test x"$ac_list_mounted_fs" = x; then
# Cray UNICOS 9
AC_MSG_CHECKING([for listmntent of Cray/Unicos-9])
AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent,
@ -85,13 +85,13 @@ if test -z "$ac_list_mounted_fs"; then
[#ifdef _CRAY
yes
#endif
], [test $ac_cv_func_listmntent = yes \
], [test x"$ac_cv_func_listmntent" = xyes \
&& fu_cv_sys_mounted_cray_listmntent=yes]
)
]
)
AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
if test $fu_cv_sys_mounted_cray_listmntent = yes; then
if test x"$fu_cv_sys_mounted_cray_listmntent" = xyes; then
ac_list_mounted_fs=found
AC_DEFINE(MOUNTED_LISTMNTENT, 1,
[Define if there is a function named listmntent that can be used to
@ -99,7 +99,7 @@ yes
fi
fi
if test -z "$ac_list_mounted_fs"; then
if test x"$ac_list_mounted_fs" = x; then
# AIX.
AC_MSG_CHECKING([for mntctl function and struct vmount])
AC_CACHE_VAL(fu_cv_sys_mounted_vmount,
@ -107,7 +107,7 @@ if test -z "$ac_list_mounted_fs"; then
fu_cv_sys_mounted_vmount=yes,
fu_cv_sys_mounted_vmount=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
if test $fu_cv_sys_mounted_vmount = yes; then
if test x"$fu_cv_sys_mounted_vmount" = xyes; then
ac_list_mounted_fs=found
AC_DEFINE(MOUNTED_VMOUNT, 1,
[Define if there is a function named mntctl that can be used to read
@ -116,12 +116,12 @@ if test -z "$ac_list_mounted_fs"; then
fi
fi
if test $ac_cv_func_getmntent = yes; then
if test x"$ac_cv_func_getmntent" = xyes; then
# This system has the getmntent function.
# Determine whether it's the one-argument variant or the two-argument one.
if test -z "$ac_list_mounted_fs"; then
if test x"$ac_list_mounted_fs" = x; then
# 4.3BSD, SunOS, HP-UX, Dynix, Irix
AC_MSG_CHECKING([for one-argument getmntent function])
AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
@ -147,7 +147,7 @@ if test $ac_cv_func_getmntent = yes; then
fu_cv_sys_mounted_getmntent1=yes,
fu_cv_sys_mounted_getmntent1=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
if test $fu_cv_sys_mounted_getmntent1 = yes; then
if test x"$fu_cv_sys_mounted_getmntent1" = xyes; then
ac_list_mounted_fs=found
AC_DEFINE(MOUNTED_GETMNTENT1, 1,
[Define if there is a function named getmntent for reading the list
@ -156,7 +156,7 @@ if test $ac_cv_func_getmntent = yes; then
fi
fi
if test -z "$ac_list_mounted_fs"; then
if test x"$ac_list_mounted_fs" = x; then
# SVR4
AC_MSG_CHECKING([for two-argument getmntent function])
AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2,
@ -164,7 +164,7 @@ if test $ac_cv_func_getmntent = yes; then
fu_cv_sys_mounted_getmntent2=yes,
fu_cv_sys_mounted_getmntent2=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
if test $fu_cv_sys_mounted_getmntent2 = yes; then
if test x"$fu_cv_sys_mounted_getmntent2" = xyes; then
ac_list_mounted_fs=found
AC_DEFINE(MOUNTED_GETMNTENT2, 1,
[Define if there is a function named getmntent for reading the list of
@ -175,7 +175,7 @@ if test $ac_cv_func_getmntent = yes; then
fi
if test -z "$ac_list_mounted_fs"; then
if test x"$ac_list_mounted_fs" = x; then
# DEC Alpha running OSF/1, and Apple Darwin 1.3.
# powerpc-apple-darwin1.3.7 needs sys/param.h sys/ucred.h sys/fs_types.h
@ -196,7 +196,7 @@ if test -z "$ac_list_mounted_fs"; then
fu_cv_sys_mounted_getfsstat=yes,
fu_cv_sys_mounted_getfsstat=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_getfsstat)
if test $fu_cv_sys_mounted_getfsstat = yes; then
if test x"$fu_cv_sys_mounted_getfsstat" = xyes; then
ac_list_mounted_fs=found
AC_DEFINE(MOUNTED_GETFSSTAT, 1,
[Define if there is a function named getfsstat for reading the
@ -204,7 +204,7 @@ if test -z "$ac_list_mounted_fs"; then
fi
fi
if test -z "$ac_list_mounted_fs"; then
if test x"$ac_list_mounted_fs" = x; then
# SVR3
AC_MSG_CHECKING([for FIXME existence of three headers])
AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp,
@ -215,7 +215,7 @@ if test -z "$ac_list_mounted_fs"; then
fu_cv_sys_mounted_fread_fstyp=yes,
fu_cv_sys_mounted_fread_fstyp=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
if test $fu_cv_sys_mounted_fread_fstyp = yes; then
if test x"$fu_cv_sys_mounted_fread_fstyp" = xyes; then
ac_list_mounted_fs=found
AC_DEFINE(MOUNTED_FREAD_FSTYP, 1,
[Define if (like SVR2) there is no specific function for reading the
@ -224,17 +224,17 @@ if test -z "$ac_list_mounted_fs"; then
fi
fi
if test -z "$ac_list_mounted_fs"; then
if test x"$ac_list_mounted_fs" = x; then
# 4.4BSD and DEC OSF/1.
AC_MSG_CHECKING([for getmntinfo function])
AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo,
[
test "$ac_cv_func_getmntinfo" = yes \
test x"$ac_cv_func_getmntinfo" = xyes \
&& fu_cv_sys_mounted_getmntinfo=yes \
|| fu_cv_sys_mounted_getmntinfo=no
])
AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
if test $fu_cv_sys_mounted_getmntinfo = yes; then
if test x"$fu_cv_sys_mounted_getmntinfo" = xyes; then
AC_MSG_CHECKING([whether getmntinfo returns statvfs structures])
AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo2,
[
@ -255,7 +255,7 @@ extern int getmntinfo (struct statfs **, int);
[fu_cv_sys_mounted_getmntinfo2=yes])
])
AC_MSG_RESULT([$fu_cv_sys_mounted_getmntinfo2])
if test $fu_cv_sys_mounted_getmntinfo2 = no; then
if test x"$fu_cv_sys_mounted_getmntinfo2" = xno; then
ac_list_mounted_fs=found
AC_DEFINE(MOUNTED_GETMNTINFO, 1,
[Define if there is a function named getmntinfo for reading the
@ -271,7 +271,7 @@ extern int getmntinfo (struct statfs **, int);
fi
fi
if test -z "$ac_list_mounted_fs"; then
if test x"$ac_list_mounted_fs" = x; then
# Ultrix
AC_MSG_CHECKING([for getmnt function])
AC_CACHE_VAL(fu_cv_sys_mounted_getmnt,
@ -281,7 +281,7 @@ if test -z "$ac_list_mounted_fs"; then
fu_cv_sys_mounted_getmnt=yes,
fu_cv_sys_mounted_getmnt=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
if test $fu_cv_sys_mounted_getmnt = yes; then
if test x"$fu_cv_sys_mounted_getmnt" = xyes; then
ac_list_mounted_fs=found
AC_DEFINE(MOUNTED_GETMNT, 1,
[Define if there is a function named getmnt for reading the list of
@ -289,20 +289,20 @@ if test -z "$ac_list_mounted_fs"; then
fi
fi
if test -z "$ac_list_mounted_fs"; then
if test x"$ac_list_mounted_fs" = x; then
# BeOS
AC_CHECK_FUNCS(next_dev fs_stat_dev)
AC_CHECK_HEADERS(fs_info.h)
AC_MSG_CHECKING([for BEOS mounted file system support functions])
if test $ac_cv_header_fs_info_h = yes \
&& test $ac_cv_func_next_dev = yes \
&& test $ac_cv_func_fs_stat_dev = yes; then
if test x"$ac_cv_header_fs_info_h" = xyes \
&& test x"$ac_cv_func_next_dev" = xyes \
&& test x"$ac_cv_func_fs_stat_dev" = xyes; then
fu_result=yes
else
fu_result=no
fi
AC_MSG_RESULT($fu_result)
if test $fu_result = yes; then
if test x"$fu_result" = xyes; then
ac_list_mounted_fs=found
AC_DEFINE(MOUNTED_FS_STAT_DEV, 1,
[Define if there are functions named next_dev and fs_stat_dev for
@ -310,7 +310,7 @@ if test -z "$ac_list_mounted_fs"; then
fi
fi
if test -z "$ac_list_mounted_fs"; then
if test x"$ac_list_mounted_fs" = x; then
# SVR2
AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab])
AC_CACHE_VAL(fu_cv_sys_mounted_fread,
@ -318,7 +318,7 @@ if test -z "$ac_list_mounted_fs"; then
fu_cv_sys_mounted_fread=yes,
fu_cv_sys_mounted_fread=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_fread)
if test $fu_cv_sys_mounted_fread = yes; then
if test x"$fu_cv_sys_mounted_fread" = xyes; then
ac_list_mounted_fs=found
AC_DEFINE(MOUNTED_FREAD, 1,
[Define if there is no specific function for reading the list of
@ -327,13 +327,13 @@ if test -z "$ac_list_mounted_fs"; then
fi
fi
if test -z "$ac_list_mounted_fs"; then
if test x"$ac_list_mounted_fs" = x; then
AC_MSG_ERROR([could not determine how to read list of mounted file systems])
# FIXME -- no need to abort building the whole package
# Can't build mountlist.c or anything that needs its functions
fi
AS_IF([test $ac_list_mounted_fs = found], [$1], [$2])
AS_IF([test x"$ac_list_mounted_fs" = xfound], [$1], [$2])
])
@ -359,7 +359,7 @@ AC_DEFUN([gl_FSUSAGE],
#include <sys/param.h>
#endif]])
gl_FILE_SYSTEM_USAGE([gl_cv_fs_space=yes], [gl_cv_fs_space=no])
if test $gl_cv_fs_space = yes; then
if test x"$gl_cv_fs_space" = xyes; then
AC_LIBOBJ(fsusage)
gl_PREREQ_FSUSAGE_EXTRA
fi
@ -383,7 +383,7 @@ ac_fsusage_space=no
# of a `struct statvfs' causes this test to fail (as it should) on such
# systems. That system is reported to work fine with STAT_STATFS4 which
# is what it gets when this test fails.
if test $ac_fsusage_space = no; then
if test x"$ac_fsusage_space" = xno; then
# SVR4
AC_CACHE_CHECK([for statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
[AC_TRY_LINK([#include <sys/types.h>
@ -403,14 +403,14 @@ call.
[struct statvfs fsd; statvfs (0, &fsd);],
fu_cv_sys_stat_statvfs=yes,
fu_cv_sys_stat_statvfs=no)])
if test $fu_cv_sys_stat_statvfs = yes; then
if test x"$fu_cv_sys_stat_statvfs" = xyes; then
ac_fsusage_space=yes
AC_DEFINE(STAT_STATVFS, 1,
[ Define if there is a function named statvfs. (SVR4)])
fi
fi
if test $ac_fsusage_space = no; then
if test x"$ac_fsusage_space" = xno; then
# DEC Alpha running OSF/1
AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
@ -429,14 +429,14 @@ if test $ac_fsusage_space = no; then
fu_cv_sys_stat_statfs3_osf1=no,
fu_cv_sys_stat_statfs3_osf1=no)])
AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
if test x"$fu_cv_sys_stat_statfs3_osf1" = xyes; then
ac_fsusage_space=yes
AC_DEFINE(STAT_STATFS3_OSF1, 1,
[ Define if statfs takes 3 args. (DEC Alpha running OSF/1)])
fi
fi
if test $ac_fsusage_space = no; then
if test x"$ac_fsusage_space" = xno; then
# AIX
AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
member (AIX, 4.3BSD)])
@ -462,7 +462,7 @@ member (AIX, 4.3BSD)])
fu_cv_sys_stat_statfs2_bsize=no,
fu_cv_sys_stat_statfs2_bsize=no)])
AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
if test $fu_cv_sys_stat_statfs2_bsize = yes; then
if test x"$fu_cv_sys_stat_statfs2_bsize" = xyes; then
ac_fsusage_space=yes
AC_DEFINE(STAT_STATFS2_BSIZE, 1,
[ Define if statfs takes 2 args and struct statfs has a field named f_bsize.
@ -470,7 +470,7 @@ member (AIX, 4.3BSD)])
fi
fi
if test $ac_fsusage_space = no; then
if test x"$ac_fsusage_space" = xno; then
# SVR3
AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
@ -486,14 +486,14 @@ if test $ac_fsusage_space = no; then
fu_cv_sys_stat_statfs4=no,
fu_cv_sys_stat_statfs4=no)])
AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
if test $fu_cv_sys_stat_statfs4 = yes; then
if test x"$fu_cv_sys_stat_statfs4" = xyes; then
ac_fsusage_space=yes
AC_DEFINE(STAT_STATFS4, 1,
[ Define if statfs takes 4 args. (SVR3, Dynix, Irix, Dolphin)])
fi
fi
if test $ac_fsusage_space = no; then
if test x"$ac_fsusage_space" = xno; then
# 4.4BSD and NetBSD
AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
member (4.4BSD and NetBSD)])
@ -516,7 +516,7 @@ member (4.4BSD and NetBSD)])
fu_cv_sys_stat_statfs2_fsize=no,
fu_cv_sys_stat_statfs2_fsize=no)])
AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
if test $fu_cv_sys_stat_statfs2_fsize = yes; then
if test x"$fu_cv_sys_stat_statfs2_fsize" = xyes; then
ac_fsusage_space=yes
AC_DEFINE(STAT_STATFS2_FSIZE, 1,
[ Define if statfs takes 2 args and struct statfs has a field named f_fsize.
@ -524,7 +524,7 @@ member (4.4BSD and NetBSD)])
fi
fi
if test $ac_fsusage_space = no; then
if test x"$ac_fsusage_space" = xno; then
# Ultrix
AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
@ -550,7 +550,7 @@ if test $ac_fsusage_space = no; then
fu_cv_sys_stat_fs_data=no,
fu_cv_sys_stat_fs_data=no)])
AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
if test $fu_cv_sys_stat_fs_data = yes; then
if test x"$fu_cv_sys_stat_fs_data" = xyes; then
ac_fsusage_space=yes
AC_DEFINE(STAT_STATFS2_FS_DATA, 1,
[ Define if statfs takes 2 args and the second argument has
@ -558,7 +558,7 @@ if test $ac_fsusage_space = no; then
fi
fi
if test $ac_fsusage_space = no; then
if test x"$ac_fsusage_space" = xno; then
# SVR2
AC_TRY_CPP([#include <sys/filsys.h>
],
@ -568,7 +568,7 @@ if test $ac_fsusage_space = no; then
ac_fsusage_space=yes)
fi
AS_IF([test $ac_fsusage_space = yes], [$1], [$2])
AS_IF([test x"$ac_fsusage_space" = xyes], [$1], [$2])
])
@ -590,7 +590,7 @@ choke -- this is a workaround for a Sun-specific problem
if (c) return 0;]])],
[fu_cv_sys_truncating_statfs=yes],
[fu_cv_sys_truncating_statfs=no])])
if test $fu_cv_sys_truncating_statfs = yes; then
if test x"$fu_cv_sys_truncating_statfs" = xyes; then
AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1,
[Define if the block counts reported by statfs may be truncated to 2GB
and the correct values may be stored in the f_spare array.

6
m4.include/ax_path_lib_pcre.m4
View File

@ -21,14 +21,14 @@ AC_ARG_WITH([pcre],
,
[with_pcre="yes"]
)
if test ".$with_pcre" = ".no" ; then
if test x"$with_pcre" = "xno" ; then
AC_MSG_RESULT([disabled])
m4_ifval($2,$2)
else
AC_MSG_RESULT([(testing)])
if test ".$with_pcre" = ".yes" ; then
if test "x$with_pcre" = "xyes" ; then
PCRE_CFLAGS="`pcre-config --cflags`"
PCRE_LIBS="`pcre-config --libs`"
else
@ -40,7 +40,7 @@ else
AC_CHECK_LIB(pcre, pcre_compile)
if test "$ac_cv_lib_pcre_pcre_compile" = "yes" ; then
if test x"$ac_cv_lib_pcre_pcre_compile" = x"yes" ; then
AC_MSG_RESULT(.setting PCRE_LIBS -L$with_pcre/lib -lpcre)
PCRE_LIBS=$test_PCRE_LIBS

6
m4.include/dx_doxygen.m4
View File

@ -88,7 +88,7 @@ AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])])
# Require the specified program to be found for the DX_CURRENT_FEATURE to work.
AC_DEFUN([DX_REQUIRE_PROG], [
AC_PATH_TOOL([$1], [$2])
if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then
if test x"$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = x1; then
AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION])
AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
fi
@ -104,7 +104,7 @@ AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1])
# Verify that a required features has the right state before trying to turn on
# the DX_CURRENT_FEATURE.
AC_DEFUN([DX_CHECK_DEPEND], [
test "$DX_FLAG_$1" = "$2" \
test x"$DX_FLAG_$1" = x"$2" \
|| AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1,
requires, contradicts) doxygen-DX_CURRENT_FEATURE])
])
@ -113,7 +113,7 @@ test "$DX_FLAG_$1" = "$2" \
# ----------------------------------------------------------
# Turn off the DX_CURRENT_FEATURE if the required feature is off.
AC_DEFUN([DX_CLEAR_DEPEND], [
test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
test x"$DX_FLAG_$1" = x"$2" || AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
])
# DX_FEATURE_ARG(FEATURE, DESCRIPTION,

4
m4.include/mc-check-search-type.m4
View File

@ -30,7 +30,7 @@ AC_DEFUN([MC_CHECK_SEARCH_TYPE],[
$PKG_CONFIG --max-version 2.14 glib-2.0
if test $? -eq 0; then
if test ! x$with_search_engine = x -a x$SEARCH_TYPE = xglib; then
if test ! x"$with_search_engine" = x -a x"$SEARCH_TYPE" = xglib; then
AC_MSG_ERROR([Selected 'glib' search engine, but you don't have glib >= 2.14])
fi
AX_PATH_LIB_PCRE
@ -39,7 +39,7 @@ AC_DEFUN([MC_CHECK_SEARCH_TYPE],[
fi
AC_DEFINE(SEARCH_TYPE_PCRE, 1, [Define to select 'pcre' search type])
else
if test x$SEARCH_TYPE = xpcre; then
if test x"$SEARCH_TYPE" = xpcre; then
AX_PATH_LIB_PCRE
if test x"${PCRE_LIBS}" = x; then
AC_MSG_ERROR([Your system don't have pcre library (or pcre devel stuff)])

2
m4.include/mc-mcserver.m4
View File

@ -30,7 +30,7 @@ AC_DEFUN([MC_MCSERVER_CHECKS], [
mcserv_pam=yes], [], [$LIB_DL])
dnl Check for crypt() - needed for both /etc/shadow and /etc/passwd.
if test -z "$mcserv_pam"; then
if test x"$mcserv_pam" = x; then
dnl Check for pwdauth() - used on SunOS.
AC_CHECK_FUNCS([pwdauth])

2
m4.include/mc-use-termcap.m4
View File

@ -28,7 +28,7 @@ AC_DEFUN([MC_SLANG_TERMCAP], [
LIBS="$ac_save_LIBS"
])
if test x$mc_cv_slang_termcap = xyes; then
if test x"$mc_cv_slang_termcap" = xyes; then
MC_USE_TERMCAP
fi
])

8
m4.include/mc-vfs.m4
View File

@ -1,6 +1,6 @@
AC_DEFUN([AC_MC_VFS_ADDNAME],
[
if test "$vfs_flags" = "" ; then
if test x"$vfs_flags" = "x" ; then
vfs_flags="$1"
else
vfs_flags="$vfs_flags, $1"
@ -39,7 +39,7 @@ AC_DEFUN([MC_WITH_VFS],
if test "x$enable_netcode" != xno; then
dnl FIXME: network checks should probably be in their own macro.
AC_SEARCH_LIBS(socket, [xnet bsd socket inet], [have_socket=yes])
if test x$have_socket = xyes; then
if test x"$have_socket" = xyes; then
AC_SEARCH_LIBS(gethostbyname, [bsd socket inet netinet])
AC_CHECK_MEMBERS([struct linger.l_linger], , , [
#include <sys/types.h>
@ -65,7 +65,7 @@ AC_DEFUN([MC_WITH_VFS],
AC_DEFUN([AC_MC_VFS_CHECKS],[
AC_ARG_ENABLE([vfs],
[ --disable-vfs Compile with VFS code])
if test "$enable_vfs" != "no" ; then
if test x"$enable_vfs" != x"no" ; then
enable_vfs="yes"
vfs_type="Midnight Commander Virtual Filesystem"
use_vfs=yes
@ -90,5 +90,5 @@ AC_DEFUN([AC_MC_VFS_CHECKS],[
vfs_type="Plain OS filesystem"
fi
AM_CONDITIONAL(ENABLE_VFS, [test "$enable_vfs" = "yes"])
AM_CONDITIONAL(ENABLE_VFS, [test x"$enable_vfs" = x"yes"])
])

192
m4.include/mc-with-screen.m4
View File

@ -1,12 +1,3 @@
dnl
dnl Common code for MC_WITH_SLANG and MC_WITH_MCSLANG
dnl
AC_DEFUN([_MC_WITH_XSLANG], [
screen_type=slang
AC_DEFINE(HAVE_SLANG, 1,
[Define to use S-Lang library for screen management])
])
dnl
dnl Check if private functions are available for linking
dnl
@ -38,7 +29,7 @@ AC_DEFUN([MC_SLANG_PRIVATE], [
LIBS="$ac_save_LIBS"
])
if test x$mc_cv_slang_private = xyes; then
if test x"$mc_cv_slang_private" = xyes; then
AC_DEFINE(HAVE_SLANG_PRIVATE, 1,
[Define if private S-Lang functions are available])
fi
@ -49,46 +40,165 @@ dnl
dnl Check if the system S-Lang library can be used.
dnl If not, and $1 is "strict", exit, otherwise fall back to mcslang.
dnl
AC_DEFUN([MC_WITH_SLANG], [
with_screen=slang
AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
ac_slang_inc_path=[$1]
ac_slang_lib_path=[$2]
if test x"$ac_slang_inc_path" != x; then
ac_slang_inc_path="-I"$ac_slang_inc_path
fi
if test x"$ac_slang_lib_path" != x; then
ac_slang_lib_path="-L"$ac_slang_lib_path
fi
saved_CFLAGS="$CFLAGS"
saved_CPPFLAGS="$CPPFLAGS"
saved_LDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $ac_slang_inc_path $ac_slang_lib_path"
CPPFLAGS="$saved_CPPFLAGS $ac_slang_inc_path $ac_slang_lib_path"
dnl Check the header
slang_h_found=
AC_CHECK_HEADERS([slang.h slang/slang.h],
[slang_h_found=yes; break])
if test -z "$slang_h_found"; then
AC_MSG_ERROR([Slang header not found])
fi
AC_MSG_CHECKING([for slang.h])
AC_PREPROC_IFELSE(
[
AC_LANG_PROGRAM([#include <slang.h>],[return 0;])
],
[
AC_MSG_RESULT(yes)
if test x"$ac_slang_inc_path" = x; then
ac_slang_inc_path="-I/usr/include"
fi
if test x"$ac_slang_lib_path" = x; then
ac_slang_lib_path="-L/usr/lib"
fi
found_slang=yes
],
[
AC_MSG_RESULT(no)
AC_MSG_CHECKING([for slang/slang.h])
AC_PREPROC_IFELSE(
[
AC_LANG_PROGRAM([#include <slang/slang.h>],[return 0;])
],
[
AC_MSG_RESULT(yes)
if test x"$ac_slang_inc_path" = x; then
ac_slang_inc_path="-I/usr/include"
fi
if test x"$ac_slang_lib_path" = x; then
ac_slang_lib_path="-L/usr/lib"
fi
found_slang=yes
],
[
AC_MSG_RESULT(no)
found_slang=no
error_msg_slang="Slang header not found"
]
)
],
)
dnl Check if termcap is needed.
dnl This check must be done before anything is linked against S-Lang.
if test x$with_screen = xslang; then
MC_SLANG_TERMCAP
fi
if test x"$found_slang" = x"yes"; then
CFLAGS="$saved_CFLAGS $ac_slang_inc_path $ac_slang_lib_path"
LDFLAGS="$saved_LDFLAGS $ac_slang_lib_path"
CPPFLAGS="$saved_CPPFLAGS $ac_slang_inc_path $ac_slang_lib_path"
MC_SLANG_TERMCAP
if test x"$mc_cv_slang_termcap" = x"yes"; then
ac_slang_lib_path="$ac_slang_lib_path -ltermcap"
CFLAGS="$saved_CFLAGS $ac_slang_inc_path $ac_slang_lib_path"
CPPFLAGS="$saved_CPPFLAGS $ac_slang_inc_path $ac_slang_lib_path"
LDFLAGS="$saved_LDFLAGS $ac_slang_lib_path"
fi
fi
dnl Check the library
if test x$with_screen = xslang; then
AC_CHECK_LIB([slang], [SLang_init_tty], [MCLIBS="$MCLIBS -lslang"],
AC_MSG_ERROR([Slang library not found]), ["$MCLIBS"])
if test x"$found_slang" = x"yes"; then
unset ac_cv_lib_slang_SLang_init_tty
AC_CHECK_LIB(
[slang],
[SLang_init_tty],
[:],
[
found_slang=no
error_msg_slang="Slang library not found"
]
)
fi
dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
if test x$with_screen = xslang; then
AC_CHECK_LIB(
[slang],
[SLsmg_write_nwchars],
[AC_MSG_ERROR([Rejecting S-Lang with UTF-8 support, it's not fully supported yet])])
if test x"$found_slang" = x"yes"; then
unset ac_cv_lib_slang_SLsmg_write_nwchars
AC_CHECK_LIB(
[slang],
[SLsmg_write_nwchars],
[
found_slang=no
error_msg_slang="Rejecting S-Lang with UTF-8 support, it's not fully supported yet"
],
[:]
)
fi
if test x$with_screen = xslang; then
MC_SLANG_PRIVATE
screen_type=slang
screen_msg="S-Lang library (installed on the system)"
else
AC_MSG_ERROR([S-Lang library not found])
if test x"$found_slang" = x"yes"; then
MC_SLANG_PRIVATE
screen_type=slang
screen_msg="S-Lang library (installed on the system)"
AC_DEFINE(HAVE_SLANG, 1,
[Define to use S-Lang library for screen management])
MCLIBS="$MCLIBS $ac_slang_inc_path $ac_slang_lib_path -lslang"
fi
CFLAGS="$saved_CFLAGS"
CPPFLAGS="$saved_CPPFLAGS"
LDFLAGS="$saved_LDFLAGS"
])
AC_DEFUN([MC_WITH_SLANG], [
with_screen=slang
found_slang=yes
error_msg_slang=""
AC_ARG_WITH([slang-includes],
AC_HELP_STRING([--with-slang-includes=@<:@DIR@:>@],
[set path to SLANG includes @<:@default=/usr/include@:>@; may sense only if --with-screen=slang]
),
[ac_slang_inc_path="$withval"],
[ac_slang_inc_path=""]
)
AC_ARG_WITH([slang-libs],
AC_HELP_STRING([--with-slang-libs=@<:@DIR@:>@],
[set path to SLANG library @<:@default=/usr/lib@:>@; may sense only if --with-screen=slang]
),
[ac_slang_lib_path="$withval"],
[ac_slang_lib_path=""]
)
echo 'checking SLANG-headers in default place ...'
MC_CHECK_SLANG_BY_PATH([$ac_slang_inc_path],[$ac_slang_lib_path])
if test x"$found_slang" = "xno"; then
ac_slang_inc_path="/usr/include"
ac_slang_lib_path="/usr/lib"
echo 'checking SLANG-headers in /usr ...'
MC_CHECK_SLANG_BY_PATH([$ac_slang_inc_path],[$ac_slang_lib_path])
if test x"$found_slang" = "xno"; then
ac_slang_inc_path="/usr/local/include"
ac_slang_lib_path="/usr/local/lib"
echo 'checking SLANG-headers in /usr/local ...'
MC_CHECK_SLANG_BY_PATH( $ac_slang_inc_path , $ac_slang_lib_path )
if test x"$found_slang" = "xno"; then
AC_MSG_ERROR([$error_msg_slang])
fi
fi
fi
_MC_WITH_XSLANG
])
dnl
@ -106,7 +216,7 @@ AC_DEFUN([MC_WITH_NCURSES], [
AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
[AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
if test -z "$ncursesw_found"; then
if test x"$ncursesw_found" = "x"; then
LIBS=
AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"],
[AC_MSG_ERROR([Cannot find ncurses library])])
@ -117,7 +227,7 @@ AC_DEFUN([MC_WITH_NCURSES], [
AC_CHECK_HEADERS([ncursesw/curses.h ncurses/curses.h ncurses.h curses.h],
[ncurses_h_found=yes; break])
if test -z "$ncurses_h_found"; then
if test x"$ncurses_h_found" = "x"; then
AC_MSG_ERROR([Cannot find ncurses header file])
fi
@ -135,7 +245,7 @@ AC_DEFUN([MC_WITH_NCURSES], [
[mc_cv_ncurses_escdelay=yes],
[mc_cv_ncurses_escdelay=no])
])
if test "$mc_cv_ncurses_escdelay" = yes; then
if test x"$mc_cv_ncurses_escdelay" = xyes; then
AC_DEFINE(HAVE_ESCDELAY, 1,
[Define if ncurses has ESCDELAY variable])
fi
@ -164,7 +274,7 @@ AC_DEFUN([MC_WITH_NCURSESW], [
AC_CHECK_HEADERS([ncursesw/curses.h],
[ncursesw_h_found=yes; break])
if test -z "$ncursesw_h_found"; then
if test x"$ncursesw_h_found" = "x"; then
AC_MSG_ERROR([Cannot find ncursesw header file])
fi
@ -182,7 +292,7 @@ AC_DEFUN([MC_WITH_NCURSESW], [
[mc_cv_ncursesw_escdelay=yes],
[mc_cv_ncursesw_escdelay=no])
])
if test "$mc_cv_ncursesw_escdelay" = yes; then
if test x"$mc_cv_ncursesw_escdelay" = xyes; then
AC_DEFINE(HAVE_ESCDELAY, 1,
[Define if ncursesw has ESCDELAY variable])
fi

10
m4.include/vfs/mc-mvfs.m4
View File

@ -1,12 +1,12 @@
AC_DEFUN([AC_PREPARE_MVFS],
[
AM_CONDITIONAL(ENABLE_MVFS, [test "$enable_mvfs" = "yes"])
AM_CONDITIONAL(ENABLE_MVFS, [test x"$enable_mvfs" = x"yes"])
])
AC_DEFUN([AC_REQUIRE_MVFS],
[
echo "libmvfs required ... checking ...";
if test "$got_mvfs" = "yes" ; then
if test x"$got_mvfs" = x"yes" ; then
echo "mvfs already enabled"
else
PKG_CHECK_MODULES([MVFS], [libmvfs])
@ -14,18 +14,18 @@ AC_DEFUN([AC_REQUIRE_MVFS],
got_mvfs="yes"
AC_MC_VFS_ADDNAME([mvfs])
fi
AM_CONDITIONAL(ENABLE_MVFS, [test "$enable_mvfs" = "yes"])
AM_CONDITIONAL(ENABLE_MVFS, [test x"$enable_mvfs" = x"yes"])
])
AC_DEFUN([AC_MVFS_FS], [
AC_PREPARE_MVFS
AC_ARG_ENABLE([mvfs-$1],[ --enable-mvfs-$1 Support for $3 (via libmvfs)])
if test "$enable_mvfs_$1" == "yes" ; then
if test x"$enable_mvfs_$1" = x"yes" ; then
AC_REQUIRE_MVFS
AC_DEFINE(ENABLE_MVFS_$2, 1, [$1 (via libmvfs)])
AC_MC_VFS_ADDNAME([mvfs-$1])
fi
AM_CONDITIONAL(ENABLE_MVFS_$2, [test "$enable_mvfs_$1" == "yes"])
AM_CONDITIONAL(ENABLE_MVFS_$2, [test x"$enable_mvfs_$1" = x"yes"])
])
AC_DEFUN([AC_MVFS_NINEP], [AC_MVFS_FS([9p], [NINEP], [9P Filesystem])])

7
m4.include/vfs/mc-vfs-cpiofs.m4
View File

@ -3,13 +3,10 @@ AC_DEFUN([AC_MC_VFS_CPIOFS],
[
AC_ARG_ENABLE([vfs-cpio],
[ --disable-vfs-cpio Support for cpio filesystem [[yes]]])
if test "$enable_vfs_cpio" != "no"; then
if test "$enable_mvfs_cpio" ; then
AC_ERROR([Internal CPIO-FS conflicts with mvfs-cpiofs])
fi
if test x"$enable_vfs_cpio" != x"no"; then
AC_DEFINE([ENABLE_VFS_CPIO], [1], [Support for cpio filesystem])
AC_MC_VFS_ADDNAME([cpio])
enable_vfs_cpio="yes"
fi
AM_CONDITIONAL(ENABLE_VFS_CPIO, [test "$enable_vfs_cpio" = "yes"])
AM_CONDITIONAL(ENABLE_VFS_CPIO, [test x"$enable_vfs_cpio" = x"yes"])
])

9
m4.include/vfs/mc-vfs-extfs.m4
View File

@ -10,7 +10,7 @@ AC_DEFUN([AC_MC_EXTFS_CHECKS], [
if $UNZIP -Z </dev/null >/dev/null 2>&1; then
mc_cv_have_zipinfo=yes
fi])
if test "x$mc_cv_have_zipinfo" = xyes; then
if test x"$mc_cv_have_zipinfo" = xyes; then
HAVE_ZIPINFO=1
else
HAVE_ZIPINFO=0
@ -25,14 +25,11 @@ AC_DEFUN([AC_MC_VFS_EXTFS],
[
AC_ARG_ENABLE([vfs-extfs],
[ --disable-vfs-extfs Support for extfs [[yes]]])
if test "$enable_vfs_extfs" != "no"; then
if test "$enable_mvfs_extfs" = "yes" ; then
AC_ERROR([Internal extfs conflicts with mvfs-extfs])
fi
if test x"$enable_vfs_extfs" != x"no"; then
AC_MC_EXTFS_CHECKS
enable_vfs_extfs="yes"
AC_MC_VFS_ADDNAME([extfs])
AC_DEFINE([ENABLE_VFS_EXTFS], [1], [Support for extfs])
fi
AM_CONDITIONAL(ENABLE_VFS_EXTFS, [test "$enable_vfs_extfs" = "yes"])
AM_CONDITIONAL(ENABLE_VFS_EXTFS, [test x"$enable_vfs_extfs" = x"yes"])
])

5
m4.include/vfs/mc-vfs-fish.m4
View File

@ -4,12 +4,9 @@ AC_DEFUN([AC_MC_VFS_FISH],
AC_ARG_ENABLE([vfs-fish],
[ --disable-vfs-fish Support for FISH vfs [[yes]]])
if test "x$enable_vfs_fish" != xno; then
if test "x$enable_mvfs_fish" = "yes"; then
AC_ERROR([Internal FISH-fs conflicts with mvfs-based fish])
fi
enable_vfs_fish="yes"
AC_MC_VFS_ADDNAME([fish])
AC_DEFINE([ENABLE_VFS_FISH], [1], [Support for FISH vfs])
fi
AM_CONDITIONAL(ENABLE_VFS_FISH, [test "$enable_vfs_fish" = "yes"])
AM_CONDITIONAL(ENABLE_VFS_FISH, [test x"$enable_vfs_fish" = x"yes"])
])

7
m4.include/vfs/mc-vfs-ftp.m4
View File

@ -3,13 +3,10 @@ AC_DEFUN([AC_MC_VFS_FTP],
[
AC_ARG_ENABLE([vfs-ftp],
[ --disable-vfs-ftp Support for FTP vfs [[yes]]])
if test "$enable_vfs_ftp" != "no"; then
if test "$enable_mvfs_ftp" ; then
AC_ERROR([Internal ftp conflicts with mvfs-ftp])
fi
if test x"$enable_vfs_ftp" != x"no"; then
enable_vfs_ftp="yes"
AC_MC_VFS_ADDNAME([ftp])
AC_DEFINE([ENABLE_VFS_FTP], [1], [Support for FTP (classic)])
fi
AM_CONDITIONAL([ENABLE_VFS_FTP], [test "$enable_vfs_ftp" = "yes"])
AM_CONDITIONAL([ENABLE_VFS_FTP], [test x"$enable_vfs_ftp" = x"yes"])
])

2
m4.include/vfs/mc-vfs-mcfs.m4
View File

@ -11,7 +11,7 @@ AC_DEFUN([AC_MC_VFS_MCFS],
[
AC_ARG_ENABLE([vfs-mcfs],
[ --enable-vfs-mcfs Enable Support MCFS (mc's network filesystem)])
if test "$enable_vfs_mcfs" = "yes" ; then
if test x"$enable_vfs_mcfs" = x"yes" ; then
AC_MC_VFS_MCFS_SET
fi
])

2
m4.include/vfs/mc-vfs-samba.m4
View File

@ -7,7 +7,7 @@ AC_DEFUN([AC_MC_VFS_SAMBA],
use_smbfs=
AC_ARG_WITH(samba,
[ --with-samba Support smb virtual file system [[no]]],
[if test "x$withval" != "xno"; then
[if test x"$withval" != x"no"; then
AC_DEFINE(WITH_SMBFS, 1, [Define to enable VFS over SMB])
vfs_flags="$vfs_flags, smbfs"
use_smbfs=yes

7
m4.include/vfs/mc-vfs-sfs.m4
View File

@ -3,13 +3,10 @@ AC_DEFUN([AC_MC_VFS_SFS],
[
AC_ARG_ENABLE([sfs],
[ --disable-vfs-sfs Support for sfs [[yes]]])
if test "$enable_vfs_sfs" != "no"; then
if test "$enable_mvfs_sfs" ; then
AC_ERROR([Internal SFS conflicts with mvfs-sfs])
fi
if test x"$enable_vfs_sfs" != x"no"; then
enable_vfs_sfs="yes"
AC_MC_VFS_ADDNAME([sfs])
AC_DEFINE([ENABLE_VFS_SFS], [1], [Support for sfs])
fi
AM_CONDITIONAL(ENABLE_VFS_SFS, [test "$enable_vfs_sfs" = "yes"])
AM_CONDITIONAL(ENABLE_VFS_SFS, [test x"$enable_vfs_sfs" = x"yes"])
])

7
m4.include/vfs/mc-vfs-tarfs.m4
View File

@ -3,13 +3,10 @@ AC_DEFUN([AC_MC_VFS_TARFS],
[
AC_ARG_ENABLE([vfs-tar],
[ --disable-vfs-tar Support for tar filesystem [[yes]]])
if test "$enable_vfs_tar" != "no"; then
if test "$enable_mvfs_tar" ; then
AC_ERROR([Internal TAR-FS conflicts with mvfs-tarfs])
fi
if test x"$enable_vfs_tar" != x"no"; then
enable_vfs_tar="yes"
AC_MC_VFS_ADDNAME([tar])
AC_DEFINE([ENABLE_VFS_TAR], [1], [Support for tar filesystem])
fi
AM_CONDITIONAL(ENABLE_VFS_TAR, [test "$enable_vfs_tar" = "yes"])
AM_CONDITIONAL(ENABLE_VFS_TAR, [test x"$enable_vfs_tar" = x"yes"])
])

10
m4.include/vfs/mc-vfs-undelfs.m4
View File

@ -8,7 +8,7 @@ AC_DEFUN([MC_UNDELFS_CHECKS], [
ext2fs_undel=no
EXT2FS_UNDEL_LIBS=
AC_CHECK_HEADERS([ext2fs/ext2_fs.h linux/ext2_fs.h], [ext2_fs_h=yes; break])
if test x$ext2_fs_h = xyes; then
if test x"$ext2_fs_h" = xyes; then
AC_CHECK_HEADERS([ext2fs/ext2fs.h], [ext2fs_ext2fs_h=yes], ,
[
#include <stdio.h>
@ -19,7 +19,7 @@ AC_DEFUN([MC_UNDELFS_CHECKS], [
#include <linux/ext2_fs.h>
#endif
])
if test x$ext2fs_ext2fs_h = xyes; then
if test x"$ext2fs_ext2fs_h" = xyes; then
AC_DEFINE(USE_EXT2FSLIB, 1,
[Define to enable undelete support on ext2])
ext2fs_undel=yes
@ -52,11 +52,11 @@ AC_DEFUN([AC_MC_VFS_UNDELFS],
AC_ARG_ENABLE([undelfs],
[ --enable-vfs-undelfs Support for ext2 undelete filesystem])
if test "$enable_vfs_undelfs" = "yes" ; then
if test x"$enable_vfs_undelfs" = x"yes" ; then
MC_UNDELFS_CHECKS
if test "$ext2fs_undel" = yes; then
if test x"$ext2fs_undel" = xyes; then
enable_vfs_undelfs="yes"
AC_MC_VFS_ADDNAME([undelfs])
AC_DEFINE(ENABLE_VFS_UNDELFS, [1], [Support for ext2 undelfs])
@ -66,5 +66,5 @@ AC_DEFUN([AC_MC_VFS_UNDELFS],
AC_ERROR([Ext2 libraries not found])
fi
fi
AM_CONDITIONAL(ENABLE_VFS_UNDELFS, [test "$enable_vfs_undelfs" = "yes"])
AM_CONDITIONAL(ENABLE_VFS_UNDELFS, [test x"$enable_vfs_undelfs" = x"yes"])
])

2
m4.include/vfs/socket.m4
View File

@ -1,7 +1,7 @@
AC_DEFUN([AC_REQUIRE_SOCKET],
[
AC_SEARCH_LIBS(socket, [xnet bsd socket inet], [have_socket=yes])
if test x$have_socket = xyes; then
if test x"$have_socket" = xyes; then
AC_SEARCH_LIBS(gethostbyname, [bsd socket inet netinet])
AC_CHECK_MEMBERS([struct linger.l_linger], , , [
#include <sys/types.h>

2
src/subshell.c
View File

@ -403,6 +403,8 @@ init_subshell (void)
subshell_type = ZSH;
else if (strstr (shell, "/tcsh"))
subshell_type = TCSH;
else if (strstr (shell, "/csh"))
subshell_type = TCSH;
else if (strstr (shell, "/bash") || getenv ("BASH"))
subshell_type = BASH;
else if (strstr (shell, "/fish"))