mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

* acinclude.m4: Provide descriptions in all AC_DEFINE macros.

Browse Source 
* configure.in: Likewise.  Use AH_BOTTOM to include extraconf.h.
* acconfig.h: Remove.
This commit is contained in:
Pavel Roskin 2001-09-11 00:27:03 +00:00
parent 0883a31c10
commit 5452cf366a
4 changed files with 88 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2001-09-10 Pavel Roskin <proski@gnu.org>
* acinclude.m4: Provide descriptions in all AC_DEFINE macros.
* configure.in: Likewise. Use AH_BOTTOM to include extraconf.h.
* acconfig.h: Remove.
* configure.in: Eliminate LIBSLANG and LSLANG.
* acinclude.m4: Likewise. Use MCLIBS for -lslang.

130
acconfig.h
View File

@ -1,130 +0,0 @@
/* This is the configuration file for the Midnight Commander. It was generated
by autoconf's configure.
Configure for Midnight Commander
Copyright (C) 1994, 1995 Janne Kukonlehto
Copyright (C) 1994, 1995 Miguel de Icaza
Copyright (C) 1995 Jakub Jelinek
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
@TOP@
#undef D_INO_IN_DIRENT
#undef MOUNTED_FREAD
#undef MOUNTED_FREAD_FSTYP
#undef MOUNTED_GETFSSTAT
#undef MOUNTED_GETMNT
#undef MOUNTED_GETMNTENT1
#undef MOUNTED_GETMNTENT2
#undef MOUNTED_GETMNTINFO
#undef MOUNTED_VMOUNT
#undef STAT_STATFS2_BSIZE
#undef STAT_STATFS2_FSIZE
#undef STAT_STATFS2_FS_DATA
#undef STAT_STATFS3_OSF1
#undef STAT_STATFS4
#undef STAT_STATVFS
#undef HAVE_F_FSTYPENAME
/* Define umode_t if your system does not provide it */
#undef umode_t
/* Define nlink_t if your system does not provide it */
#undef nlink_t
/* Is the program using the GPM library? */
#undef HAVE_LIBGPM
/* Is the text edition compiled with X11 support? */
#undef HAVE_TEXTMODE_X11_SUPPORT
/* Is the program using the distributed slang library? */
#undef HAVE_SLANG
/* Is the program using a system-installed slang library? */
#undef HAVE_SYSTEM_SLANG
/* Does the program have subshell support? */
#undef HAVE_SUBSHELL_SUPPORT
/* Found some version of curses that we're going to use */
#undef HAS_CURSES
/* Is the subshell the default or optional? */
#undef SUBSHELL_OPTIONAL
/* Use Ncurses? */
#undef USE_NCURSES
/* Support the Midnight Commander Virtual File System? */
#undef USE_VFS
/* Support for the Memory Allocation Debugger */
#undef HAVE_MAD
/* If the Slang library will be using it's own terminfo instead of termcap */
#undef SLANG_TERMINFO
/* If Slang library should use termcap */
#undef USE_TERMCAP
/* If you have socket and the rest of the net functions use this */
#undef USE_NETCODE
/* If your operating system does not have enough space for a file name
* in a struct dirent, then define this
*/
#undef NEED_EXTRA_DIRENT_BUFFER
/* Define this one if you want termnet support */
#undef USE_TERMNET
/* Defined if you have shadow passwords on Linux */
#undef LINUX_SHADOW
/* Defined if you have the crypt prototype in neither unistd.h nor crypt.h */
#undef NEED_CRYPT_PROTOTYPE
/* Define if your system has struct linger */
#undef HAVE_STRUCT_LINGER
/* Define if your curses has this one (AIX, OSF/1) */
#undef USE_SETUPTERM
/* Link in ext2fs code for delfs experimental file system */
#undef USE_EXT2FSLIB
/* Define if your system uses PAM for auth stuff */
#undef HAVE_PAM
/* Define if you have the get_process_stats function and have to use that instead of gettimeofday */
#undef HAVE_GET_PROCESS_STATS
/* Define if your system has socket() */
#undef HAVE_SOCKET
/* Define if you want to call the internal routine edit() for the editor */
#undef USE_INTERNAL_EDIT
/* Version of ncurses */
#undef NCURSES_970530
#undef WITH_SMBFS
@BOTTOM@
#include <extraconf.h>

86
acinclude.m4
View File

@ -14,7 +14,8 @@ AC_DEFUN([MC_UNDELFS_CHECKS], [
#include <linux/ext2_fs.h>])
if test x$ac_cv_header_ext2fs_ext2fs_h = xyes
then
AC_DEFINE(USE_EXT2FSLIB)
AC_DEFINE(USE_EXT2FSLIB, 1,
[Define to enable undelete support on ext2])
ext2fs_undel=yes
EXT2FS_UNDEL_LIBS="-lext2fs -lcom_err"
fi
@ -92,7 +93,7 @@ AC_DEFUN([MC_WITH_VFS],[
AC_ARG_WITH(samba,
[--with-samba Support smb virtual file system],[
if test "x$withval" != "xno"; then
AC_DEFINE(WITH_SMBFS)
AC_DEFINE(WITH_SMBFS, 1, [Define to enable VFS over SMB])
vfs_flags="$vfs_flags, smbfs"
smbfs="smbfs.o"
SAMBAFILES="\$(SAMBAFILES)"
@ -108,15 +109,16 @@ AC_DEFUN([MC_WITH_VFS],[
AC_ARG_WITH(termnet,
[--with-termnet If you want a termified net support],[
if test x$withval = xyes; then
AC_DEFINE(USE_TERMNET)
AC_DEFINE(USE_TERMNET, 1,
[Define to enable `term' firewall support])
termnet=true
fi
])
TERMNET=""
AC_DEFINE(USE_VFS)
AC_DEFINE(USE_VFS, 1, [Define to enable VFS support])
if $use_net_code; then
AC_DEFINE(USE_NETCODE)
AC_DEFINE(USE_NETCODE, 1, [Define to use networked VFS])
fi
mcserv=
if test $have_socket = yes; then
@ -171,7 +173,8 @@ int main ()
return 0;
}
],[
AC_DEFINE(HAVE_STRUCT_LINGER)
AC_DEFINE(HAVE_STRUCT_LINGER, 1,
[Define if `struct linger' is available])
av_struct_linger=yes
],[
av_struct_linger=no
@ -215,7 +218,8 @@ int main ()
CFLAGS="$OCFLAGS"
])
if test x$ac_cv_dnamesize = xno; then
AC_DEFINE(NEED_EXTRA_DIRENT_BUFFER)
AC_DEFINE(NEED_EXTRA_DIRENT_BUFFER, 1,
[Define if using `struct dirent' can overwrite stack])
fi
AC_MSG_RESULT([$ac_cv_dnamesize])
])
@ -263,7 +267,8 @@ AC_DEFUN([AC_GET_FS_INFO], [
fu_cv_sys_d_ino_in_dirent=no)])
AC_MSG_RESULT([$fu_cv_sys_d_ino_in_dirent])
if test $fu_cv_sys_d_ino_in_dirent = yes; then
AC_DEFINE(D_INO_IN_DIRENT)
AC_DEFINE(D_INO_IN_DIRENT, 1,
[Define if `d_ino' is member of `struct directory'])
fi
# Determine how to get the list of mounted filesystems.
@ -288,7 +293,8 @@ AC_DEFUN([AC_GET_FS_INFO], [
AC_MSG_RESULT([$fu_cv_sys_mounted_getmntent2])
if test $fu_cv_sys_mounted_getmntent2 = yes; then
list_mounted_fs=found
AC_DEFINE(MOUNTED_GETMNTENT2)
AC_DEFINE(MOUNTED_GETMNTENT2, 1,
[Define if function `getmntent' takes 2 arguments])
fi
fi
@ -302,7 +308,8 @@ AC_DEFUN([AC_GET_FS_INFO], [
AC_MSG_RESULT([$fu_cv_sys_mounted_getmntent1])
if test $fu_cv_sys_mounted_getmntent1 = yes; then
list_mounted_fs=found
AC_DEFINE(MOUNTED_GETMNTENT1)
AC_DEFINE(MOUNTED_GETMNTENT1, 1,
[Define if function `getmntent' takes 1 argument])
fi
fi
@ -323,7 +330,8 @@ AC_DEFUN([AC_GET_FS_INFO], [
AC_MSG_RESULT([$fu_cv_sys_mounted_getsstat])
if test $fu_cv_sys_mounted_getsstat = yes; then
list_mounted_fs=found
AC_DEFINE(MOUNTED_GETFSSTAT)
AC_DEFINE(MOUNTED_GETFSSTAT, 1,
[Define if function `getfsstat' can be used])
fi
fi
@ -337,7 +345,8 @@ AC_DEFUN([AC_GET_FS_INFO], [
AC_MSG_RESULT([$fu_cv_sys_mounted_vmount])
if test $fu_cv_sys_mounted_vmount = yes; then
list_mounted_fs=found
AC_DEFINE(MOUNTED_VMOUNT)
AC_DEFINE(MOUNTED_VMOUNT, 1,
[Define if function `mntctl' and `struct vmount' can be used])
fi
fi
@ -354,7 +363,9 @@ AC_DEFUN([AC_GET_FS_INFO], [
AC_MSG_RESULT([$fu_cv_sys_mounted_fread_fstyp])
if test $fu_cv_sys_mounted_fread_fstyp = yes; then
list_mounted_fs=found
AC_DEFINE(MOUNTED_FREAD_FSTYP)
AC_DEFINE(MOUNTED_FREAD_FSTYP, 1,
[Define if sys/statfs.h, sys/fstyp.h and mnttab.h
can be used together])
fi
fi
@ -375,7 +386,8 @@ AC_DEFUN([AC_GET_FS_INFO], [
AC_MSG_RESULT([$fu_cv_sys_mounted_getmntinfo])
if test $fu_cv_sys_mounted_getmntinfo = yes; then
list_mounted_fs=found
AC_DEFINE(MOUNTED_GETMNTINFO)
AC_DEFINE(MOUNTED_GETMNTINFO, 1,
[Define if `getmntinfo' function can be used])
AC_MSG_CHECKING([if struct statfs has f_fstypename])
AC_CACHE_VAL(fu_cv_sys_mounted_f_fstypename,
[AC_EGREP_HEADER([f_fstypename],
@ -385,7 +397,8 @@ AC_DEFUN([AC_GET_FS_INFO], [
])
AC_MSG_RESULT([$fu_cv_sys_mounted_f_fstypename])
if test $fu_cv_sys_mounted_f_fstypename = yes; then
AC_DEFINE(HAVE_F_FSTYPENAME)
AC_DEFINE(HAVE_F_FSTYPENAME, 1,
[Define if `f_fstypename' is member of `struct statfs'])
fi
fi
fi
@ -402,7 +415,8 @@ AC_DEFUN([AC_GET_FS_INFO], [
AC_MSG_RESULT([$fu_cv_sys_mounted_getmnt])
if test $fu_cv_sys_mounted_getmnt = yes; then
list_mounted_fs=found
AC_DEFINE(MOUNTED_GETMNT)
AC_DEFINE(MOUNTED_GETMNT, 1,
[Define if `getmnt' function can be used])
fi
fi
@ -416,7 +430,8 @@ AC_DEFUN([AC_GET_FS_INFO], [
AC_MSG_RESULT([$fu_cv_sys_mounted_fread])
if test $fu_cv_sys_mounted_fread = yes; then
list_mounted_fs=found
AC_DEFINE(MOUNTED_FREAD)
AC_DEFINE(MOUNTED_FREAD, 1,
[Define if it's possible to resort to fread on /etc/mnttab])
fi
fi
@ -440,7 +455,8 @@ dnl job is to detect a method to get file system information.
AC_CHECK_FUNCS(statvfs)
if test $ac_cv_func_statvfs = yes; then
space=yes
AC_DEFINE(STAT_STATVFS)
AC_DEFINE(STAT_STATVFS, 1,
[Define if function `statfs' can be used])
fi
fi
@ -464,7 +480,8 @@ dnl job is to detect a method to get file system information.
AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
space=yes
AC_DEFINE(STAT_STATFS3_OSF1)
AC_DEFINE(STAT_STATFS3_OSF1, 1,
[Define if function `statfs' takes 3 arguments])
fi
fi
@ -494,7 +511,9 @@ dnl job is to detect a method to get file system information.
AC_MSG_RESULT([$fu_cv_sys_stat_statfs2_bsize])
if test $fu_cv_sys_stat_statfs2_bsize = yes; then
space=yes
AC_DEFINE(STAT_STATFS2_BSIZE)
AC_DEFINE(STAT_STATFS2_BSIZE, 1,
[Define if function `statfs' takes two arguments and
`bsize' is member of `struct statfs'])
fi
fi
@ -515,7 +534,8 @@ dnl job is to detect a method to get file system information.
AC_MSG_RESULT([$fu_cv_sys_stat_statfs4])
if test $fu_cv_sys_stat_statfs4 = yes; then
space=yes
AC_DEFINE(STAT_STATFS4)
AC_DEFINE(STAT_STATFS4, 1,
[Define if function `statfs' takes 4 arguments])
fi
fi
@ -543,7 +563,9 @@ dnl job is to detect a method to get file system information.
AC_MSG_RESULT([$fu_cv_sys_stat_statfs2_fsize])
if test $fu_cv_sys_stat_statfs2_fsize = yes; then
space=yes
AC_DEFINE(STAT_STATFS2_FSIZE)
AC_DEFINE(STAT_STATFS2_FSIZE, 1,
[Define if function `statfs' takes two arguments and
`fsize' is member of `struct statfs'])
fi
fi
@ -575,7 +597,9 @@ dnl job is to detect a method to get file system information.
AC_MSG_RESULT([$fu_cv_sys_stat_fs_data])
if test $fu_cv_sys_stat_fs_data = yes; then
space=yes
AC_DEFINE(STAT_STATFS2_FS_DATA)
AC_DEFINE(STAT_STATFS2_FS_DATA, 1,
[Define if function `statfs' takes two arguments
and uses `struct fs_data'])
fi
fi
@ -614,25 +638,27 @@ rm -f conftest*]
)
AC_DEFUN([AC_USE_TERMINFO], [
AC_DEFINE(SLANG_TERMINFO)
AC_DEFINE(SLANG_TERMINFO, 1, [Define to use S-Lang with terminfo])
AC_MSG_RESULT([Using SLang screen manager/terminfo])
slang_term=" with terminfo"
])
AC_DEFUN([AC_USE_TERMCAP], [
AC_MSG_RESULT([Using SLang screen manager/termcap])
AC_DEFINE(USE_TERMCAP)
AC_DEFINE(USE_TERMCAP, 1, [[Define to use termcap library]])
dnl Check with $LIBS at the end so that it works with ELF libs.
AC_CHECK_LIB(termcap, tgoto, LIBS="$LIBS -ltermcap", , $LIBS)
slang_term=" with termcap"
])
AC_DEFUN([AC_WITH_SLANG], [
AC_DEFINE(HAVE_SLANG)
AC_DEFINE(HAVE_SLANG, 1,
[Define to use S-Lang library for screen management])
search_ncurses=false
if $slang_use_system_installed_lib
then
AC_DEFINE(HAVE_SYSTEM_SLANG)
AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
[Define to use S-Lang library installed on the system])
MCLIBS="-lslang $MCLIBS"
screen_manager="SLang (system-installed library)"
AC_MSG_RESULT([Using system installed SLang library])
@ -684,7 +710,8 @@ AC_DEFUN([AC_WITH_SLANG], [
)
AC_DEFUN([AC_WITH_EDIT], [
AC_DEFINE(USE_INTERNAL_EDIT)
AC_DEFINE(USE_INTERNAL_EDIT, 1,
[Define to enable internal editor])
LIBEDIT_A="libedit.a"
MCEDIT="mcedit"
LEDIT="-ledit"
@ -717,7 +744,8 @@ AC_DEFUN([AC_NCURSES], [
CPPFLAGS="$CPPFLAGS $4"
search_ncurses=false
screen_manager=$5
AC_DEFINE(USE_NCURSES)
AC_DEFINE(USE_NCURSES, 1,
[Define to use ncurses for screen management])
fi
fi
])

38
configure.in
View File

@ -119,7 +119,8 @@ linux*)
[AC_CHECK_HEADERS(shadow/shadow.h,,
[shadow_header=no])])
if test $shadow_header = yes; then
AC_DEFINE(LINUX_SHADOW)
AC_DEFINE(LINUX_SHADOW, 1,
[Define to use shadow passwords on Linux])
SHADOWLIB=-lshadow
fi])
;;
@ -141,7 +142,8 @@ NEED_CRYPT_PROTOTYPE=no])
fi
fi
if test x$NEED_CRYPT_PROTOTYPE = xyes; then
AC_DEFINE(NEED_CRYPT_PROTOTYPE)
AC_DEFINE(NEED_CRYPT_PROTOTYPE, 1,
[Define if function `crypt' needs a prototype])
fi
dnl
@ -215,7 +217,8 @@ AC_ARG_WITH(tm-x-support,
[if test x$withval = xyes; then
MCCFLAGS="$X_CFLAGS"
MCLIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
AC_DEFINE(HAVE_TEXTMODE_X11_SUPPORT)
AC_DEFINE(HAVE_TEXTMODE_X11_SUPPORT, 1,
[Define to enable getting events from X Window System])
textmode_x11_support="yes"
fi
])
@ -256,7 +259,9 @@ dnl Sequent wants getprocessstats
dnl
AC_CHECK_LIB(seq, get_process_stats, [
LIBS="$LIBS -lseq"
AC_DEFINE(HAVE_GET_PROCESS_STATS)])
AC_DEFINE(HAVE_GET_PROCESS_STATS, 1,
[Define if you have function `get_process_stats' and
have to use that instead of gettimeofday])])
MC_VFS_CHECKS
@ -294,7 +299,8 @@ linux*)
LIBS="$LIBS -L$withval/lib"
CPPFLAGS="$CPPFLAGS -I$withval/include"
fi
AC_DEFINE(HAVE_LIBGPM)
AC_DEFINE(HAVE_LIBGPM, 1,
[Define to enable gpm mouse support on Linux])
mouse_lib="GPM and xterm"
MCLIBS="-lgpm $MCLIBS"
fi],
@ -464,8 +470,10 @@ AC_ARG_WITH(subshell,
[result=no
if test x$withval = xoptional
then
AC_DEFINE(SUBSHELL_OPTIONAL)
AC_DEFINE(HAVE_SUBSHELL_SUPPORT)
AC_DEFINE(SUBSHELL_OPTIONAL, 1,
[Define to make subshell support optional])
AC_DEFINE(HAVE_SUBSHELL_SUPPORT, 1,
[Define to enable subshell support])
result="optional"
fi
if test x$withval = xyes
@ -495,7 +503,8 @@ AC_ARG_WITH(mad,
[--with-mad Developers only: activates MAD (memory debugger)],
[if test x$withval = xyes; then
mem_debug="Janne's MAD library"
AC_DEFINE(HAVE_MAD)
AC_DEFINE(HAVE_MAD, 1,
[Define to use Memory Allocation Debugger (MAD)])
AC_MSG_RESULT([compiling with memory leak detector])
fi])
@ -662,7 +671,9 @@ EOF
AC_MSG_RESULT([$ncurses_version])
case "$ncurses_version" in
4.[[01]])
AC_DEFINE(NCURSES_970530,2)
AC_DEFINE(NCURSES_970530,2,
[Define according to ncurses version,
see configure.in for details])
;;
1.9.9g)
AC_DEFINE(NCURSES_970530,1)
@ -721,7 +732,8 @@ linux*)
dnl On Linux, check for PAM authentication available
dnl
AC_CHECK_LIB(pam, pam_start, [
AC_DEFINE(HAVE_PAM)
AC_DEFINE(HAVE_PAM, 1,
[Define if PAM (Pluggable Authentication Modules) is available])
PAMLIBS="-lpam -ldl"
],[],[-ldl])
;;
@ -768,7 +780,9 @@ SLang*)
return 0;
],
[LIBS="$LIBS -lcurses"
AC_DEFINE(USE_SETUPTERM)])
AC_DEFINE(USE_SETUPTERM, 1,
[Define to use function `setupterm'
from `curses' library in S-Lang])])
])
esac
;;
@ -797,6 +811,8 @@ AM_CONDITIONAL(INCLUDED_SLANG,
AM_CONDITIONAL(CHARSET, [test -n "$have_charset"])
AM_CONDITIONAL(CONS_SAVER, [test -n "$cons_saver"])
AH_BOTTOM([#include <extraconf.h>])
AC_OUTPUT([
Makefile
mc.spec