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 (AC_EXT2_UNDEL): Add ext2fs libraries to MC_LIBS,

Browse Source 
not to LIBS.
* configure.in: Fix breakage in ncurses headers check from the
previous commit.  Simplify other instances of AC_CHECK_HEADERS.
Define REGEX_MALLOC here.
This commit is contained in:
Pavel Roskin 2002-07-13 19:09:10 +00:00
parent 4f4e0c2d2e
commit 81db2df680
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2002-07-13 Pavel Roskin <proski@gnu.org>
* acinclude.m4 (AC_EXT2_UNDEL): Add ext2fs libraries to MC_LIBS,
not to LIBS.
* configure.in: Fix breakage in ncurses headers check from the
previous commit. Simplify other instances of AC_CHECK_HEADERS.
Define REGEX_MALLOC here.
* acinclude.m4 (AC_NCURSES): Remove.
* configure.in: Use AC_CHECK_HEADERS to find ncurses headers and
AC_CHECK_LIB to check existance of ncurses library. Eliminate

2
acinclude.m4
View File

@ -773,7 +773,7 @@ AC_DEFUN([AC_EXT2_UNDEL], [
AC_MSG_NOTICE([using ext2fs file recovery code])
vfs_flags="${vfs_flags}, undelfs"
undelfs_o="undelfs.o"
LIBS="$LIBS $EXT2FS_UNDEL_LIBS"
MCLIBS="$MCLIBS $EXT2FS_UNDEL_LIBS"
else
AC_MSG_NOTICE([not using ext2fs file recovery code])
fi

35
configure.in
View File

@ -131,11 +131,10 @@ SHADOWLIB=
case $host_os in
linux*)
AC_CHECK_LIB(shadow,pw_encrypt,
[shadow_header=yes
AC_CHECK_HEADERS(shadow.h,,
[AC_CHECK_HEADERS(shadow/shadow.h,,
[shadow_header=no])])
if test $shadow_header = yes; then
[shadow_header=
AC_CHECK_HEADERS([shadow.h shadow/shadow.h],
[shadow_header=yes; break])
if test -n "$shadow_header"; then
AC_DEFINE(LINUX_SHADOW, 1,
[Define to use shadow passwords on Linux])
SHADOWLIB=-lshadow
@ -336,15 +335,16 @@ AC_ARG_WITH(ncurses,
CPPFLAGS="$CPPFLAGS -I$withval/include"
fi
AC_CHECK_HEADERS([ncurses/curses.h ncurses.h curses.h], [break],
[AC_MSG_ERROR([Could not find ncurses header])])
AC_CHECK_HEADERS([ncurses/curses.h ncurses.h curses.h],
[ncurses_h_found=yes; break])
if test -z "$ncurses_h_found"; then
AC_MSG_ERROR([Could not find ncurses header])
fi
dnl -lncurses should not go to LIBS, hence [:]
dnl curses_version is specific to ncurses, it's not in old curses
AC_CHECK_LIB(ncurses, curses_version, [:],
AC_CHECK_LIB(ncurses, curses_version, [MCLIBS="$MCLIBS -lncurses"],
[AC_MSG_ERROR([Could not find ncurses library])])
MCLIBS="$MCLIBS -lncurses"
screen_type="ncurses"
screen_manager="ncurses"
AC_DEFINE(USE_NCURSES, 1,
@ -498,6 +498,8 @@ AC_ARG_WITH(subshell,
AC_MSG_RESULT([$result])
subshell="$result"
AC_DEFINE(REGEX_MALLOC, 1, [Define to make regex use malloc(), not alloca()])
dnl
dnl Memory Allocation Debugger
dnl
@ -527,18 +529,11 @@ if test "x$screen_type" != xncurses; then
slang_term=""
slang_use_system_installed_lib=false
AC_CHECK_LIB(slang,SLang_init_tty,
[AC_CHECK_HEADERS(slang.h)
if test x$ac_cv_header_slang_h = xyes
then
[AC_CHECK_HEADERS([slang.h slang/slang.h],
[slang_h_found=yes; break])
if test "x$slang_h_found" = xyes; then
slang_use_system_installed_lib=true
slang_check_lib=false
else
AC_CHECK_HEADERS(slang/slang.h)
if test x$ac_cv_header_slang_slang_h = xyes
then
slang_use_system_installed_lib=true
slang_check_lib=false
fi
fi
])
fi