Browse Source

Remove autogenerated stuff from git-tracking.
* Remove m4/* files
* Reorganize all M4-stuff into m4.include subdur
* move doxygen-include.am into doc/doxygen-include.am

Slava Zanko 16 years ago
parent
commit
0e6b076666

+ 1 - 1
Makefile.am

@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.5
 
-SUBDIRS = intl po m4 vfs edit src lib doc syntax
+SUBDIRS = intl po vfs edit src lib doc syntax
 
 EXTRA_DIST = FAQ HACKING INSTALL.FAST MAINTAINERS README.QNX TODO pkginfo.in prototype.in mc.qpg mc.spec
 

+ 7 - 625
acinclude.m4

@@ -1,626 +1,8 @@
-dnl MC_UNDELFS_CHECKS
-dnl    Check for ext2fs undel support.
-dnl    Set shell variable ext2fs_undel to "yes" if we have it,
-dnl    "no" otherwise.  May define USE_EXT2FSLIB for cpp.
-dnl    Will set EXT2FS_UNDEL_LIBS to required libraries.
-
-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
-    AC_CHECK_HEADERS([ext2fs/ext2fs.h], [ext2fs_ext2fs_h=yes], ,
-		     [
-#include <stdio.h>
-#ifdef HAVE_EXT2FS_EXT2_FS_H
-#include <ext2fs/ext2_fs.h>
-#else
-#undef umode_t
-#include <linux/ext2_fs.h>
-#endif
-		     ])
-    if test x$ext2fs_ext2fs_h = xyes; then
-      AC_DEFINE(USE_EXT2FSLIB, 1,
-		[Define to enable undelete support on ext2])
-      ext2fs_undel=yes
-      EXT2FS_UNDEL_LIBS="-lext2fs -lcom_err"
-      AC_CHECK_TYPE(ext2_ino_t, ,
-		    [AC_DEFINE(ext2_ino_t, ino_t,
-			       [Define to ino_t if undefined.])],
-		    [
-#include <errno.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#ifdef HAVE_EXT2FS_EXT2_FS_H
-#include <ext2fs/ext2_fs.h>
-#else
-#undef umode_t
-#include <linux/ext2_fs.h>
-#endif
-#include <ext2fs/ext2fs.h>
-		    ])
-    fi
-  fi
-])
-
-
-
-dnl MC_EXTFS_CHECKS
-dnl    Check for tools used in extfs scripts.
-AC_DEFUN([MC_EXTFS_CHECKS], [
-    AC_PATH_PROG([ZIP], [zip], [/usr/bin/zip])
-    AC_PATH_PROG([UNZIP], [unzip], [/usr/bin/unzip])
-    AC_CACHE_CHECK([for zipinfo code in unzip], [mc_cv_have_zipinfo],
-	[mc_cv_have_zipinfo=no
-	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
-	HAVE_ZIPINFO=1
-    else
-	HAVE_ZIPINFO=0
-    fi
-    AC_SUBST([HAVE_ZIPINFO])
-    AC_PATH_PROG([PERL], [perl], [/usr/bin/perl])
-])
-
-
-
-dnl MC_MCSERVER_CHECKS
-dnl    Check how mcserver should check passwords.
-dnl    Possible methods are PAM, pwdauth and crypt.
-dnl    The later works with both /etc/shadow and /etc/passwd.
-dnl    If PAM is found, other methods are not checked.
-
-AC_DEFUN([MC_MCSERVER_CHECKS], [
-
-    dnl Check if PAM can be used for mcserv
-    AC_CHECK_LIB(dl, dlopen, [LIB_DL="-ldl"])
-    AC_CHECK_LIB(pam, pam_start, [
-	AC_DEFINE(HAVE_PAM, 1,
-		  [Define if PAM (Pluggable Authentication Modules) is available])
-	MCSERVLIBS="-lpam $LIB_DL"
-	mcserv_pam=yes], [], [$LIB_DL])
-
-    dnl Check for crypt() - needed for both /etc/shadow and /etc/passwd.
-    if test -z "$mcserv_pam"; then
-
-	dnl Check for pwdauth() - used on SunOS.
-	AC_CHECK_FUNCS([pwdauth])
-
-	dnl Check for crypt()
-	AC_CHECK_HEADERS([crypt.h], [crypt_header=yes])
-	if test -n "$crypt_header"; then
-	    save_LIBS="$LIBS"
-	    LIBS=
-	    AC_SEARCH_LIBS(crypt, [crypt crypt_i], [mcserv_auth=crypt])
-	    MCSERVLIBS="$LIBS"
-	    LIBS="$save_LIBS"
-	    if test -n "$mcserv_auth"; then
-		AC_DEFINE(HAVE_CRYPT, 1,
-			  [Define to use crypt function in mcserv])
-
-		dnl Check for shadow passwords
-		AC_CHECK_HEADERS([shadow.h shadow/shadow.h],
-				 [shadow_header=yes; break])
-		if test -n "$shadow_header"; then
-		    save_LIBS="$LIBS"
-		    LIBS="$MCSERVLIBS"
-		    AC_SEARCH_LIBS(getspnam, [shadow], [mcserv_auth=shadow])
-		    MCSERVLIBS="$LIBS"
-		    LIBS="$save_LIBS"
-		    if test -n "$mcserv_auth"; then
-			AC_DEFINE(HAVE_SHADOW, 1,
-				  [Define to use shadow passwords for mcserv])
-		    fi
-		fi
-	    fi
-	fi
-    fi
-
-    AC_SUBST(MCSERVLIBS)
-])
-
-
-
-dnl MC_VFS_CHECKS
-dnl   Check for various functions needed by libvfs.
-dnl   This has various effects:
-dnl     Sets MC_VFS_LIBS to libraries required
-dnl     Sets vfs_flags to "pretty" list of vfs implementations we include.
-dnl     Sets shell variable use_vfs to yes (default, --with-vfs) or
-dnl        "no" (--without-vfs).
-
-dnl Private define
-AC_DEFUN([MC_WITH_VFS],[
-  MC_EXTFS_CHECKS
-
-  vfs_flags="cpiofs, extfs, tarfs"
-  use_net_code=false
-
-  AC_ARG_ENABLE([netcode],
-		[  --enable-netcode         Support for networking [[yes]]])
-
-  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
-      AC_SEARCH_LIBS(gethostbyname, [bsd socket inet netinet])
-      AC_CHECK_MEMBERS([struct linger.l_linger], , , [
-#include <sys/types.h>
-#include <sys/socket.h>
-		       ])
-      AC_CHECK_FUNCS(pmap_set, , [
-	 AC_CHECK_LIB(rpc, pmap_set, [
-	   LIBS="-lrpc $LIBS"
-	  AC_DEFINE(HAVE_PMAP_SET)
-	  ])])
-      AC_CHECK_FUNCS(pmap_getport pmap_getmaps rresvport)
-      dnl add for source routing support setsockopt
-      AC_CHECK_HEADERS(rpc/pmap_clnt.h, , , [
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-					    ])
-      dnl
-      dnl mcfs support
-      dnl
-      AC_ARG_WITH(mcfs,
-	[  --with-mcfs              Support mc-specific networking file system [[no]]],
-	[if test "x$withval" != "xno"; then
-	    AC_DEFINE(WITH_MCFS, 1, [Define to enable mc-specific networking file system])
-	    vfs_flags="$vfs_flags, mcfs"
-	    use_mcfs=yes
-	    MC_MCSERVER_CHECKS
-	fi]
-      )
-      vfs_flags="$vfs_flags, ftpfs, fish"
-      use_net_code=true
-    fi
-  fi
-
-  dnl
-  dnl Samba support
-  dnl
-  use_smbfs=
-  AC_ARG_WITH(samba,
-  	  [  --with-samba             Support smb virtual file system [[no]]],
-	  [if test "x$withval" != "xno"; then
-  		  AC_DEFINE(WITH_SMBFS, 1, [Define to enable VFS over SMB])
-	          vfs_flags="$vfs_flags, smbfs"
-		  use_smbfs=yes
-  	  fi
-  ])
-
-  if test -n "$use_smbfs"; then
-  #################################################
-  # set Samba configuration directory location
-  configdir="/etc"
-  AC_ARG_WITH(configdir,
-  [  --with-configdir=DIR     Where the Samba configuration files are [[/etc]]],
-  [ case "$withval" in
-    yes|no)
-    #
-    # Just in case anybody does it
-    #
-	AC_MSG_WARN([--with-configdir called without argument - will use default])
-    ;;
-    * )
-	configdir="$withval"
-    ;;
-  esac]
-  )
-  AC_SUBST(configdir)
-
-  AC_ARG_WITH(codepagedir,
-    [  --with-codepagedir=DIR   Where the Samba codepage files are],
-    [ case "$withval" in
-      yes|no)
-      #
-      # Just in case anybody does it
-      #
-	AC_MSG_WARN([--with-codepagedir called without argument - will use default])
-      ;;
-    esac]
-  )
-  fi
-
-  dnl
-  dnl Ext2fs undelete support
-  dnl
-  AC_ARG_WITH(ext2undel,
-    [  --with-ext2undel         Compile with ext2 undelete code [[yes if found]]],
-    [if test x$withval != xno; then
-      if test x$withval != xyes; then
-	LDFLAGS="$LDFLAGS -L$withval/lib"
-	CPPFLAGS="$CPPFLAGS -I$withval/include"
-      fi
-      AC_EXT2_UNDEL
-    fi],[
-    dnl Default: detect
-    AC_CHECK_LIB(ext2fs, ext2fs_close, [AC_EXT2_UNDEL], , [-lcom_err])
-  ])
-
-  AC_DEFINE(USE_VFS, 1, [Define to enable VFS support])
-  if $use_net_code; then
-     AC_DEFINE(USE_NETCODE, 1, [Define to use networked VFS])
-  fi
-])
-
-
-
-AC_DEFUN([MC_VFS_CHECKS],[
-	use_vfs=yes
-	AC_ARG_WITH(vfs,
-		[  --with-vfs               Compile with the VFS code [[yes]]],
-		use_vfs=$withval
-	)
-	case $use_vfs in
-		yes) 	MC_WITH_VFS;;
-		no) 	use_vfs=no;;
-		*)   	use_vfs=no;;
-			dnl Should we issue a warning?
-	esac
-])
-
-
-
-dnl
-dnl Filesystem information detection
-dnl
-dnl To get information about the disk, mount points, etc.
-dnl
-
-AC_DEFUN([AC_GET_FS_INFO], [
-    AC_CHECK_HEADERS([fcntl.h utime.h])
-
-    gl_LIST_MOUNTED_FILE_SYSTEMS([
-	AC_DEFINE(HAVE_INFOMOUNT_LIST, 1,
-	    [Define if the list of mounted filesystems can be determined])],
-	[AC_MSG_WARN([could not determine how to read list of mounted fs])])
-
-    gl_FSUSAGE
-    gl_FSTYPENAME
-])
-
-
-dnl
-dnl Try using termcap database and link with libtermcap if possible.
-dnl
-AC_DEFUN([MC_USE_TERMCAP], [
-	screen_msg="$screen_msg with termcap database"
-	AC_MSG_NOTICE([using S-Lang screen library with termcap])
-	AC_DEFINE(USE_TERMCAP, 1, [Define to use termcap database])
-	AC_CHECK_LIB(termcap, tgoto, [MCLIBS="$MCLIBS -ltermcap"], , [$LIBS])
-])
-
-
-dnl
-dnl Check if private functions are available for linking
-dnl
-AC_DEFUN([MC_SLANG_PRIVATE], [
-    AC_CACHE_CHECK([if S-Lang exports private functions],
-		   [mc_cv_slang_private], [
-	ac_save_LIBS="$LIBS"
-	LIBS="$LIBS -lslang"
-	AC_TRY_LINK([
-		     #ifdef HAVE_SLANG_SLANG_H
-		     #include <slang/slang.h>
-		     #else
-		     #include <slang.h>
-		     #endif
-		     #if SLANG_VERSION >= 10000
-		     extern unsigned int SLsys_getkey (void);
-		     #else
-		     extern unsigned int _SLsys_getkey (void);
-		     #endif
-		    ], [
-		     #if SLANG_VERSION >= 10000
-		     _SLsys_getkey ();
-		     #else
-		     SLsys_getkey ();
-		     #endif
-		    ],
-		    [mc_cv_slang_private=yes],
-		    [mc_cv_slang_private=no])
-	LIBS="$ac_save_LIBS"
-    ])
-
-    if test x$mc_cv_slang_private = xyes; then
-	AC_DEFINE(HAVE_SLANG_PRIVATE, 1,
-		  [Define if private S-Lang functions are available])
-    fi
-])
-
-
-dnl
-dnl Check if the installed S-Lang library uses termcap
-dnl
-AC_DEFUN([MC_SLANG_TERMCAP], [
-    AC_CACHE_CHECK([if S-Lang uses termcap], [mc_cv_slang_termcap], [
-	ac_save_LIBS="$LIBS"
-	LIBS="$LIBS -lslang"
-	AC_TRY_LINK([
-		     #ifdef HAVE_SLANG_SLANG_H
-		     #include <slang/slang.h>
-		     #else
-		     #include <slang.h>
-		     #endif
-		    ],
-		    [SLtt_get_terminfo(); SLtt_tgetflag("");],
-		    [mc_cv_slang_termcap=no],
-		    [mc_cv_slang_termcap=yes])
-	LIBS="$ac_save_LIBS"
-    ])
-
-    if test x$mc_cv_slang_termcap = xyes; then
-	MC_USE_TERMCAP
-    fi
-])
-
-dnl
-dnl Common code for MC_WITH_SLANG
-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 the system S-Lang library can be used.
-dnl If not, and $1 is "strict", exit.
-dnl
-AC_DEFUN([MC_WITH_SLANG], [
-    with_screen=slang
-
-    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
-
-    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
-
-    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"])
-    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])])
-    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])
-    fi
-
-    _MC_WITH_XSLANG
-])
-
-
-dnl
-dnl Use the ncurses library.  It can only be requested explicitly,
-dnl so just fail if anything goes wrong.
-dnl
-dnl If ncurses exports the ESCDELAY variable it should be set to 0
-dnl or you'll have to press Esc three times to dismiss a dialog box.
-dnl
-AC_DEFUN([MC_WITH_NCURSES], [
-    dnl has_colors() is specific to ncurses, it's not in the old curses
-    save_LIBS="$LIBS"
-    ncursesw_found=
-    LIBS=
-    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
-    LIBS=
-    AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"],
-		   [AC_MSG_ERROR([Cannot find ncurses library])])
-    fi
-
-    dnl Check the header
-    ncurses_h_found=
-    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
-	AC_MSG_ERROR([Cannot find ncurses header file])
-    fi
-
-    screen_type=ncurses
-    screen_msg="ncurses library"
-    AC_DEFINE(USE_NCURSES, 1,
-	      [Define to use ncurses for screen management])
-
-    AC_CACHE_CHECK([for ESCDELAY variable],
-		   [mc_cv_ncurses_escdelay],
-		   [AC_TRY_LINK([], [
-			extern int ESCDELAY;
-			ESCDELAY = 0;
-			],
-			[mc_cv_ncurses_escdelay=yes],
-			[mc_cv_ncurses_escdelay=no])
-    ])
-    if test "$mc_cv_ncurses_escdelay" = yes; then
-	AC_DEFINE(HAVE_ESCDELAY, 1,
-		  [Define if ncurses has ESCDELAY variable])
-    fi
-
-    AC_CHECK_FUNCS(resizeterm)
-    LIBS="$save_LIBS"
-])
-
-dnl
-dnl Use the ncurses library.  It can only be requested explicitly,
-dnl so just fail if anything goes wrong.
-dnl
-dnl If ncurses exports the ESCDELAY variable it should be set to 0
-dnl or you'll have to press Esc three times to dismiss a dialog box.
-dnl
-AC_DEFUN([MC_WITH_NCURSESW], [
-    dnl has_colors() is specific to ncurses, it's not in the old curses
-    save_LIBS="$LIBS"
-    LIBS=
-    AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"],
-		   [AC_MSG_ERROR([Cannot find ncursesw library])])
-
-    dnl Check the header
-    ncurses_h_found=
-    AC_CHECK_HEADERS([ncursesw/curses.h],
-		     [ncursesw_h_found=yes; break])
-
-    if test -z "$ncursesw_h_found"; then
-	AC_MSG_ERROR([Cannot find ncursesw header file])
-    fi
-
-    screen_type=ncursesw
-    screen_msg="ncursesw library"
-    AC_DEFINE(USE_NCURSESW, 1,
-	      [Define to use ncursesw for screen management])
-
-    AC_CACHE_CHECK([for ESCDELAY variable],
-		   [mc_cv_ncursesw_escdelay],
-		   [AC_TRY_LINK([], [
-			extern int ESCDELAY;
-			ESCDELAY = 0;
-			],
-			[mc_cv_ncursesw_escdelay=yes],
-			[mc_cv_ncursesw_escdelay=no])
-    ])
-    if test "$mc_cv_ncursesw_escdelay" = yes; then
-	AC_DEFINE(HAVE_ESCDELAY, 1,
-		  [Define if ncursesw has ESCDELAY variable])
-    fi
-
-    AC_CHECK_FUNCS(resizeterm)
-    LIBS="$save_LIBS"
-])
-
-
-dnl
-dnl Check for ext2fs recovery code
-dnl
-AC_DEFUN([AC_EXT2_UNDEL], [
-  MC_UNDELFS_CHECKS
-  if test "$ext2fs_undel" = yes; then
-     AC_MSG_NOTICE([using ext2fs file recovery code])
-     vfs_flags="${vfs_flags}, undelfs"
-     use_undelfs=yes
-     MCLIBS="$MCLIBS $EXT2FS_UNDEL_LIBS"
-  else
-     AC_MSG_NOTICE([not using ext2fs file recovery code])
-  fi
-])
-
-dnl
-dnl Check whether the g_module_* family of functions works
-dnl on this system.  We need to know that at the compile time to
-dnl decide whether to link with X11.
-dnl
-AC_DEFUN([AC_G_MODULE_SUPPORTED], [
-    AC_CACHE_CHECK([if gmodule functionality is supported], mc_cv_g_module_supported, [
-	ac_save_CFLAGS="$CFLAGS"
-	ac_save_LIBS="$LIBS"
-	CFLAGS="$CFLAGS $GMODULE_CFLAGS"
-	LIBS="$GMODULE_LIBS $LIBS"
-	AC_TRY_RUN([
-#include <gmodule.h>
-
-int main ()
-{
-    int ret = (g_module_supported () == TRUE) ? 0 : 1;
-    return ret;
-}
-	],
-	    [mc_cv_g_module_supported=yes],
-	    [mc_cv_g_module_supported=no],
-	    [mc_cv_g_module_supported=no]
-	)
-	CFLAGS="$ac_save_CFLAGS"
-	LIBS="$ac_save_LIBS"
-    ])
-
-if test "$mc_cv_g_module_supported" = yes; then
-    AC_DEFINE(HAVE_GMODULE, 1,
-	      [Define if gmodule functionality is supported])
-fi
-])
-
-dnl @synopsis AX_PATH_LIB_PCRE [(A/NA)]
-dnl
-dnl check for pcre lib and set PCRE_LIBS and PCRE_CFLAGS accordingly.
-dnl
-dnl also provide --with-pcre option that may point to the $prefix of
-dnl the pcre installation - the macro will check $pcre/include and
-dnl $pcre/lib to contain the necessary files.
-dnl
-dnl the usual two ACTION-IF-FOUND / ACTION-IF-NOT-FOUND are supported
-dnl and they can take advantage of the LIBS/CFLAGS additions.
-dnl
-dnl @category InstalledPackages
-dnl @author Guido U. Draheim <guidod@gmx.de>
-dnl @version 2006-10-13
-dnl @license GPLWithACException
-
-AC_DEFUN([AX_PATH_LIB_PCRE],[dnl
-AC_MSG_CHECKING([lib pcre])
-AC_ARG_WITH(pcre,
-[  --with-pcre[[=prefix]]    compile xmlpcre part (via libpcre check)],,
-     with_pcre="yes")
-if test ".$with_pcre" = ".no" ; then
-  AC_MSG_RESULT([disabled])
-  m4_ifval($2,$2)
-else
-  AC_MSG_RESULT([(testing)])
-  AC_CHECK_LIB(pcre, pcre_study)
-  if test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then
-     PCRE_LIBS="-lpcre"
-     AC_MSG_CHECKING([lib pcre])
-     AC_MSG_RESULT([$PCRE_LIBS])
-     m4_ifval($1,$1)
-  else
-     OLDLDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS -L$with_pcre/lib"
-     OLDCPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS -I$with_pcre/include"
-     AC_CHECK_LIB(pcre, pcre_compile)
-     CPPFLAGS="$OLDCPPFLAGS"
-     LDFLAGS="$OLDLDFLAGS"
-     if test "$ac_cv_lib_pcre_pcre_compile" = "yes" ; then
-        AC_MSG_RESULT(.setting PCRE_LIBS -L$with_pcre/lib -lpcre)
-        PCRE_LIBS="-L$with_pcre/lib -lpcre"
-        test -d "$with_pcre/include" && PCRE_CFLAGS="-I$with_pcre/include"
-        AC_MSG_CHECKING([lib pcre])
-        AC_MSG_RESULT([$PCRE_LIBS])
-        m4_ifval($1,$1)
-     else
-        AC_MSG_CHECKING([lib pcre])
-        AC_MSG_RESULT([no, (WARNING)])
-        m4_ifval($2,$2)
-     fi
-  fi
-fi
-AC_SUBST([PCRE_LIBS])
-AC_SUBST([PCRE_CFLAGS])
-])
-
+m4_include([m4.include/ac_onceonly.m4])
 m4_include([m4.include/dx_doxygen.m4])
+m4_include([m4.include/mc-mcserver.m4])
+m4_include([m4.include/ac-get-fs-info.m4])
+m4_include([m4.include/mc-use-termcap.m4])
+m4_include([m4.include/mc-with-screen.m4])
+m4_include([m4.include/ac-g-module-supported.m4])
+m4_include([m4.include/mc-vfs.m4])

+ 4 - 36
configure.ac

@@ -42,48 +42,17 @@ dnl Keep this check close to the beginning, so that the users
 dnl without any glib won't have their time wasted by other checks.
 dnl
 
-AC_ARG_WITH(glib12, 
-	[  --with-glib12            Force using glib 1.2.x [[no]]])
-
 AC_ARG_WITH([glib_static],
 	    [  --with-glib-static       Link glib statically [[no]]])
 
 glib_found=no
+
 if test "x$with_glib12" != "xyes"; then
 	PKG_CHECK_MODULES(GLIB, [glib-2.0], [glib_found=yes], [:])
 fi
 
-dnl Fall back to glib-1.2, don't use pkgconfig to find it.
-if test "x$glib_found" != "xyes" ; then
-	dnl This temporary variable is a workaround for a bug in Autoconf-2.53
-	glib_path=$PATH:/usr/local/bin
-
-	dnl Klugde for FreeBSD, where glib-config is renamed to glib12-config.
-	AC_PATH_PROGS([GLIB_CONFIG], [glib-config glib12-config],,[$glib_path])
-
-	AC_ARG_VAR([GLIB_CONFIG], [Path to glib-config (version 1.2.x only)])
-	AM_PATH_GLIB(1.2.6, , [AC_MSG_ERROR([Test for glib failed.
-GNU Midnight Commander requires glib 1.2.6 or above.])])
-	dnl Save GLIB_CFLAGS and GLIB_LIBS, since the following call to
-	dnl AM_PATH_GLIB will overwrite them.
-	save_GLIB_CFLAGS="$GLIB_CFLAGS"
-	save_GLIB_LIBS="$GLIB_LIBS"
-	dnl Check for gmodule.  Store the flags necessary to compile and
-	dnl link programs using gmodule functionality in GMODULE_CFLAGS
-	dnl and GMODULE_LIBS.
-	AM_PATH_GLIB(1.2.6, [gmodule_found=yes], , [gmodule])
-	GMODULE_CFLAGS="$GLIB_CFLAGS"
-	GMODULE_LIBS="$GLIB_LIBS"
-	GLIB_CFLAGS="$save_GLIB_CFLAGS"
-	GLIB_LIBS="$save_GLIB_LIBS"
-	GLIB_LIBDIR="`$GLIB_CONFIG --exec-prefix`/lib"
-
-	dnl Used in src/glibcompat.c
-	AC_CHECK_FUNCS([strlcpy])
-else
-	PKG_CHECK_MODULES(GMODULE, [gmodule-2.0], [gmodule_found=yes])
-	GLIB_LIBDIR="`$PKG_CONFIG --variable=libdir glib-2.0`"
-fi
+PKG_CHECK_MODULES(GMODULE, [gmodule-2.0], [gmodule_found=yes])
+GLIB_LIBDIR="`$PKG_CONFIG --variable=libdir glib-2.0`"
 
 if test "x$gmodule_found" = "xyes" ; then
 	dnl Check if the gmodule functionality supported on this system.
@@ -329,7 +298,7 @@ AC_CHECK_LIB(seq, get_process_stats, [
 		  [Define if you have function `get_process_stats' and
 have to use that instead of gettimeofday])])
 
-MC_VFS_CHECKS
+AC_MC_VFS_CHECKS
 
 vfs_type="normal"
 if test x$use_vfs = xyes; then
@@ -596,7 +565,6 @@ src/search/Makefile
 
 edit/Makefile 
 syntax/Makefile
-m4/Makefile
 lib/mc.ext
 vfs/extfs/a
 vfs/extfs/apt

+ 2 - 2
doc/Makefile.am

@@ -9,10 +9,10 @@ endif
 
 pkgdata_DATA = mc.hlp
 
-EXTRA_DIST = xnc.hlp $(DX_CONFIG) doc/devel
+EXTRA_DIST = xnc.hlp $(DX_CONFIG) doc/devel doxygen-include.am
 CLEANFILES = $(pkgdata_DATA)
 
 mc.hlp: mc.1 $(srcdir)/xnc.hlp $(top_builddir)/src/man2hlp
 	- $(top_builddir)/src/man2hlp mc.1 $(srcdir)/xnc.hlp mc.hlp
 
-include ../doxygen-include.am
+include doxygen-include.am

+ 0 - 0
doxygen-include.am → doc/doxygen-include.am


+ 33 - 0
m4.include/ac-g-module-supported.m4

@@ -0,0 +1,33 @@
+dnl
+dnl Check whether the g_module_* family of functions works
+dnl on this system.  We need to know that at the compile time to
+dnl decide whether to link with X11.
+dnl
+AC_DEFUN([AC_G_MODULE_SUPPORTED], [
+    AC_CACHE_CHECK([if gmodule functionality is supported], mc_cv_g_module_supported, [
+	ac_save_CFLAGS="$CFLAGS"
+	ac_save_LIBS="$LIBS"
+	CFLAGS="$CFLAGS $GMODULE_CFLAGS"
+	LIBS="$GMODULE_LIBS $LIBS"
+	AC_TRY_RUN([
+#include <gmodule.h>
+
+int main ()
+{
+    int ret = (g_module_supported () == TRUE) ? 0 : 1;
+    return ret;
+}
+	],
+	    [mc_cv_g_module_supported=yes],
+	    [mc_cv_g_module_supported=no],
+	    [mc_cv_g_module_supported=no]
+	)
+	CFLAGS="$ac_save_CFLAGS"
+	LIBS="$ac_save_LIBS"
+    ])
+
+if test "$mc_cv_g_module_supported" = yes; then
+    AC_DEFINE(HAVE_GMODULE, 1,
+	      [Define if gmodule functionality is supported])
+fi
+])

+ 313 - 1
m4/ls-mntd-fs.m4 → m4.include/ac-get-fs-info.m4

@@ -1,4 +1,5 @@
-#serial 26
+#serial 6
+
 # How to list mounted file systems.
 
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software
@@ -335,3 +336,314 @@ fi
 AS_IF([test $ac_list_mounted_fs = found], [$1], [$2])
 
   ])
+
+# Obtaining file system usage information.
+
+# Copyright (C) 1997, 1998, 2000, 2001, 2003-2007 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Written by Jim Meyering.
+
+AC_DEFUN([gl_FSUSAGE],
+[
+  AC_LIBSOURCES([fsusage.c, fsusage.h])
+
+  AC_CHECK_HEADERS_ONCE(sys/param.h)
+  AC_CHECK_HEADERS_ONCE(sys/vfs.h sys/fs_types.h)
+  AC_CHECK_HEADERS(sys/mount.h, [], [],
+    [AC_INCLUDES_DEFAULT
+     [#if HAVE_SYS_PARAM_H
+       #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
+    AC_LIBOBJ(fsusage)
+    gl_PREREQ_FSUSAGE_EXTRA
+  fi
+])
+
+# Try to determine how a program can obtain file system usage information.
+# If successful, define the appropriate symbol (see fsusage.c) and
+# execute ACTION-IF-FOUND.  Otherwise, execute ACTION-IF-NOT-FOUND.
+#
+# gl_FILE_SYSTEM_USAGE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+
+AC_DEFUN([gl_FILE_SYSTEM_USAGE],
+[
+
+AC_MSG_NOTICE([checking how to get file system space usage])
+ac_fsusage_space=no
+
+# Perform only the link test since it seems there are no variants of the
+# statvfs function.  This check is more than just AC_CHECK_FUNCS(statvfs)
+# because that got a false positive on SCO OSR5.  Adding the declaration
+# 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
+  # SVR4
+  AC_CACHE_CHECK([for statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
+		 [AC_TRY_LINK([#include <sys/types.h>
+#if defined __GLIBC__ && !defined __BEOS__
+Do not use statvfs on systems with GNU libc, because that function stats
+all preceding entries in /proc/mounts, and that makes df hang if even
+one of the corresponding file systems is hard-mounted, but not available.
+statvfs in GNU libc on BeOS operates differently: it only makes a system
+call.
+#endif
+
+#ifdef __osf__
+"Do not use Tru64's statvfs implementation"
+#endif
+
+#include <sys/statvfs.h>],
+			      [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
+    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
+  # 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,
+  [AC_TRY_RUN([
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+  int
+  main ()
+  {
+    struct statfs fsd;
+    fsd.f_fsize = 0;
+    return statfs (".", &fsd, sizeof (struct statfs)) != 0;
+  }],
+  fu_cv_sys_stat_statfs3_osf1=yes,
+  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
+    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
+# AIX
+  AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
+member (AIX, 4.3BSD)])
+  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
+  [AC_TRY_RUN([
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+  int
+  main ()
+  {
+  struct statfs fsd;
+  fsd.f_bsize = 0;
+  return statfs (".", &fsd) != 0;
+  }],
+  fu_cv_sys_stat_statfs2_bsize=yes,
+  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
+    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.
+   (4.3BSD, SunOS 4, HP-UX, AIX PS/2)])
+  fi
+fi
+
+if test $ac_fsusage_space = no; then
+# SVR3
+  AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
+  AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
+  [AC_TRY_RUN([#include <sys/types.h>
+#include <sys/statfs.h>
+  int
+  main ()
+  {
+  struct statfs fsd;
+  return statfs (".", &fsd, sizeof fsd, 0) != 0;
+  }],
+    fu_cv_sys_stat_statfs4=yes,
+    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
+    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
+# 4.4BSD and NetBSD
+  AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
+member (4.4BSD and NetBSD)])
+  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
+  [AC_TRY_RUN([#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+  int
+  main ()
+  {
+  struct statfs fsd;
+  fsd.f_fsize = 0;
+  return statfs (".", &fsd) != 0;
+  }],
+  fu_cv_sys_stat_statfs2_fsize=yes,
+  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
+    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.
+   (4.4BSD, NetBSD)])
+  fi
+fi
+
+if test $ac_fsusage_space = no; then
+  # Ultrix
+  AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
+  AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
+  [AC_TRY_RUN([#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_FS_TYPES_H
+#include <sys/fs_types.h>
+#endif
+  int
+  main ()
+  {
+  struct fs_data fsd;
+  /* Ultrix's statfs returns 1 for success,
+     0 for not mounted, -1 for failure.  */
+  return statfs (".", &fsd) != 1;
+  }],
+  fu_cv_sys_stat_fs_data=yes,
+  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
+    ac_fsusage_space=yes
+    AC_DEFINE(STAT_STATFS2_FS_DATA, 1,
+[  Define if statfs takes 2 args and the second argument has
+   type struct fs_data.  (Ultrix)])
+  fi
+fi
+
+if test $ac_fsusage_space = no; then
+  # SVR2
+  AC_TRY_CPP([#include <sys/filsys.h>
+    ],
+    AC_DEFINE(STAT_READ_FILSYS, 1,
+      [Define if there is no specific function for reading file systems usage
+       information and you have the <sys/filsys.h> header file.  (SVR2)])
+    ac_fsusage_space=yes)
+fi
+
+AS_IF([test $ac_fsusage_space = yes], [$1], [$2])
+
+])
+
+
+# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
+# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
+# enable the work-around code in fsusage.c.
+AC_DEFUN([gl_STATFS_TRUNCATES],
+[
+  AC_MSG_CHECKING([for statfs that truncates block counts])
+  AC_CACHE_VAL(fu_cv_sys_truncating_statfs,
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#if !defined(sun) && !defined(__sun)
+choke -- this is a workaround for a Sun-specific problem
+#endif
+#include <sys/types.h>
+#include <sys/vfs.h>]],
+    [[struct statfs t; long c = *(t.f_spare);
+      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
+    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.
+       (SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem.
+       SunOS 4.1.1 seems not to be affected.)])
+  fi
+  AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
+])
+
+
+# Prerequisites of lib/fsusage.c not done by gl_FILE_SYSTEM_USAGE.
+AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA],
+[
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
+  AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h)
+  gl_STATFS_TRUNCATES
+])
+
+dnl From Jim Meyering.
+dnl
+dnl See if struct statfs has the f_fstypename member.
+dnl If so, define HAVE_STRUCT_STATFS_F_FSTYPENAME.
+dnl
+
+# Copyright (C) 1998, 1999, 2001, 2004, 2006 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FSTYPENAME],
+[
+  AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,
+    [
+      #include <sys/types.h>
+      #include <sys/param.h>
+      #include <sys/mount.h>
+    ])
+])
+
+dnl
+dnl Filesystem information detection
+dnl
+dnl To get information about the disk, mount points, etc.
+dnl
+
+AC_DEFUN([AC_GET_FS_INFO], [
+    AC_CHECK_HEADERS([fcntl.h utime.h])
+
+    gl_LIST_MOUNTED_FILE_SYSTEMS([
+	AC_DEFINE(HAVE_INFOMOUNT_LIST, 1,
+	    [Define if the list of mounted filesystems can be determined])],
+	[AC_MSG_WARN([could not determine how to read list of mounted fs])])
+
+    gl_FSUSAGE
+    gl_FSTYPENAME
+])

+ 0 - 0
m4/onceonly.m4 → m4.include/ac_onceonly.m4


+ 55 - 0
m4.include/ax_path_lib_pcre.m4

@@ -0,0 +1,55 @@
+dnl @synopsis AX_PATH_LIB_PCRE [(A/NA)]
+dnl
+dnl check for pcre lib and set PCRE_LIBS and PCRE_CFLAGS accordingly.
+dnl
+dnl also provide --with-pcre option that may point to the $prefix of
+dnl the pcre installation - the macro will check $pcre/include and
+dnl $pcre/lib to contain the necessary files.
+dnl
+dnl the usual two ACTION-IF-FOUND / ACTION-IF-NOT-FOUND are supported
+dnl and they can take advantage of the LIBS/CFLAGS additions.
+dnl
+dnl @category InstalledPackages
+dnl @author Guido U. Draheim <guidod@gmx.de>
+dnl @version 2006-10-13
+dnl @license GPLWithACException
+
+AC_DEFUN([AX_PATH_LIB_PCRE],[dnl
+AC_MSG_CHECKING([lib pcre])
+AC_ARG_WITH(pcre,
+[  --with-pcre[[=prefix]]    compile xmlpcre part (via libpcre check)],,
+     with_pcre="yes")
+if test ".$with_pcre" = ".no" ; then
+  AC_MSG_RESULT([disabled])
+  m4_ifval($2,$2)
+else
+  AC_MSG_RESULT([(testing)])
+  AC_CHECK_LIB(pcre, pcre_study)
+  if test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then
+     PCRE_LIBS="-lpcre"
+     AC_MSG_CHECKING([lib pcre])
+     AC_MSG_RESULT([$PCRE_LIBS])
+     m4_ifval($1,$1)
+  else
+     OLDLDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS -L$with_pcre/lib"
+     OLDCPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS -I$with_pcre/include"
+     AC_CHECK_LIB(pcre, pcre_compile)
+     CPPFLAGS="$OLDCPPFLAGS"
+     LDFLAGS="$OLDLDFLAGS"
+     if test "$ac_cv_lib_pcre_pcre_compile" = "yes" ; then
+        AC_MSG_RESULT(.setting PCRE_LIBS -L$with_pcre/lib -lpcre)
+        PCRE_LIBS="-L$with_pcre/lib -lpcre"
+        test -d "$with_pcre/include" && PCRE_CFLAGS="-I$with_pcre/include"
+        AC_MSG_CHECKING([lib pcre])
+        AC_MSG_RESULT([$PCRE_LIBS])
+        m4_ifval($1,$1)
+     else
+        AC_MSG_CHECKING([lib pcre])
+        AC_MSG_RESULT([no, (WARNING)])
+        m4_ifval($2,$2)
+     fi
+  fi
+fi
+AC_SUBST([PCRE_LIBS])
+AC_SUBST([PCRE_CFLAGS])
+])

+ 54 - 0
m4.include/mc-mcserver.m4

@@ -0,0 +1,54 @@
+dnl MC_MCSERVER_CHECKS
+dnl    Check how mcserver should check passwords.
+dnl    Possible methods are PAM, pwdauth and crypt.
+dnl    The later works with both /etc/shadow and /etc/passwd.
+dnl    If PAM is found, other methods are not checked.
+
+AC_DEFUN([MC_MCSERVER_CHECKS], [
+
+    dnl Check if PAM can be used for mcserv
+    AC_CHECK_LIB(dl, dlopen, [LIB_DL="-ldl"])
+    AC_CHECK_LIB(pam, pam_start, [
+	AC_DEFINE(HAVE_PAM, 1,
+		  [Define if PAM (Pluggable Authentication Modules) is available])
+	MCSERVLIBS="-lpam $LIB_DL"
+	mcserv_pam=yes], [], [$LIB_DL])
+
+    dnl Check for crypt() - needed for both /etc/shadow and /etc/passwd.
+    if test -z "$mcserv_pam"; then
+
+	dnl Check for pwdauth() - used on SunOS.
+	AC_CHECK_FUNCS([pwdauth])
+
+	dnl Check for crypt()
+	AC_CHECK_HEADERS([crypt.h], [crypt_header=yes])
+	if test -n "$crypt_header"; then
+	    save_LIBS="$LIBS"
+	    LIBS=
+	    AC_SEARCH_LIBS(crypt, [crypt crypt_i], [mcserv_auth=crypt])
+	    MCSERVLIBS="$LIBS"
+	    LIBS="$save_LIBS"
+	    if test -n "$mcserv_auth"; then
+		AC_DEFINE(HAVE_CRYPT, 1,
+			  [Define to use crypt function in mcserv])
+
+		dnl Check for shadow passwords
+		AC_CHECK_HEADERS([shadow.h shadow/shadow.h],
+				 [shadow_header=yes; break])
+		if test -n "$shadow_header"; then
+		    save_LIBS="$LIBS"
+		    LIBS="$MCSERVLIBS"
+		    AC_SEARCH_LIBS(getspnam, [shadow], [mcserv_auth=shadow])
+		    MCSERVLIBS="$LIBS"
+		    LIBS="$save_LIBS"
+		    if test -n "$mcserv_auth"; then
+			AC_DEFINE(HAVE_SHADOW, 1,
+				  [Define to use shadow passwords for mcserv])
+		    fi
+		fi
+	    fi
+	fi
+    fi
+
+    AC_SUBST(MCSERVLIBS)
+])

Some files were not shown because too many files changed in this diff