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

* acinclude.m4 (AC_USE_TERMCAP): Add -ltermcap to MCLIBS, not LIBS.

Browse Source 
* configure.in: Eliminate MCCFLAGS, use CPPFLAGS instead.  Add
"-L" options to LDFLAGS, not to LIBS or MCLIBS - this should fix
test for ncurses in non-standard directories.
This commit is contained in:
Pavel Roskin 2002-09-05 05:43:10 +00:00
parent 110af08b0b
commit 529cba289f
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2002-09-05 Pavel Roskin <proski@gnu.org>
* acinclude.m4 (AC_USE_TERMCAP): Add -ltermcap to MCLIBS, not
LIBS.
* configure.in: Eliminate MCCFLAGS, use CPPFLAGS instead. Add
"-L" options to LDFLAGS, not to LIBS or MCLIBS - this should fix
test for ncurses in non-standard directories.
2002-09-04 Pavel Roskin <proski@gnu.org> 2002-09-04 Pavel Roskin <proski@gnu.org>
* lib/mc.ext.in: Remove edit rules for compressed files that * lib/mc.ext.in: Remove edit rules for compressed files that

3
acinclude.m4
View File

@ -643,8 +643,7 @@ AC_DEFUN([AC_USE_TERMINFO], [
AC_DEFUN([AC_USE_TERMCAP], [ AC_DEFUN([AC_USE_TERMCAP], [
AC_MSG_NOTICE([using S-Lang screen manager/termcap]) AC_MSG_NOTICE([using S-Lang screen manager/termcap])
AC_DEFINE(USE_TERMCAP, 1, [Define to use termcap library]) 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, [MCLIBS="$MCLIBS -ltermcap"], , [$LIBS])
AC_CHECK_LIB(termcap, tgoto, [LIBS="$LIBS -ltermcap"], , [$LIBS])
slang_term=" with termcap" slang_term=" with termcap"
]) ])

17
configure.in
View File

@ -211,18 +211,12 @@ dnl
dnl X11 support. dnl X11 support.
dnl dnl
dnl These variables are only used when building the MC binary
MCCFLAGS=""
MCLIBS=""
AC_SUBST(MCCFLAGS)
AC_SUBST(MCLIBS)
textmode_x11_support="no" textmode_x11_support="no"
AC_ARG_WITH(tm-x-support, AC_ARG_WITH(tm-x-support,
[--with-tm-x-support Try getting events from X Window System], [--with-tm-x-support Try getting events from X Window System],
[if test x$withval = xyes; then [if test x$withval = xyes; then
AC_PATH_XTRA AC_PATH_XTRA
MCCFLAGS="$X_CFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS"
MCLIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" MCLIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
AC_DEFINE(HAVE_TEXTMODE_X11_SUPPORT, 1, AC_DEFINE(HAVE_TEXTMODE_X11_SUPPORT, 1,
[Define to enable getting events from X Window System]) [Define to enable getting events from X Window System])
@ -307,7 +301,7 @@ linux*)
then then
if test x$withval != xyes if test x$withval != xyes
then then
LIBS="$LIBS -L$withval/lib" LDFLAGS="$LDFLAGS -L$withval/lib"
CPPFLAGS="$CPPFLAGS -I$withval/include" CPPFLAGS="$CPPFLAGS -I$withval/include"
fi fi
AC_DEFINE(HAVE_LIBGPM, 1, AC_DEFINE(HAVE_LIBGPM, 1,
@ -329,7 +323,7 @@ AC_ARG_WITH(ncurses,
[--with-ncurses[[=base-dir]] Compile with ncurses/locate base dir], [--with-ncurses[[=base-dir]] Compile with ncurses/locate base dir],
[if test x$withval != xno; then [if test x$withval != xno; then
if test x$withval != xyes; then if test x$withval != xyes; then
MCLIBS="$MCLIBS -L$withval/lib" LDFLAGS="$LDFLAGS -L$withval/lib"
CPPFLAGS="$CPPFLAGS -I$withval/include" CPPFLAGS="$CPPFLAGS -I$withval/include"
fi fi
@ -566,7 +560,7 @@ if test $use_vfs = yes; then
then then
if test x$withval != xyes if test x$withval != xyes
then then
LIBS="$LIBS -L$withval/lib" LDFLAGS="$LDFLAGS -L$withval/lib"
CPPFLAGS="$CPPFLAGS -I$withval/include" CPPFLAGS="$CPPFLAGS -I$withval/include"
fi fi
AC_EXT2_UNDEL AC_EXT2_UNDEL
@ -692,6 +686,9 @@ AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_SUBST(LIBS) AC_SUBST(LIBS)
dnl Libraries used only when building the mc binary
AC_SUBST(MCLIBS)
dnl Version for the RedHat package, without dashes dnl Version for the RedHat package, without dashes
RH_VERSION=`echo $VERSION | sed 's/-//'` RH_VERSION=`echo $VERSION | sed 's/-//'`
AC_SUBST(RH_VERSION) AC_SUBST(RH_VERSION)