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

* Make.common.in (XCPPFLAGS): Don't add -I$(top_srcdir) - it's 

now done in configure. Move -I.. to the beginning.
* Makefile.am (SUBDIRS): Move intl po to the beginning, since
libintl.a may be required to link mc.
(ACLOCAL_M4_SOURCES): Remove macros/gnome-gettext.m4.
* configure.in: Use AM_GNU_GETTEXT instead of AM_GNOME_GETTEXT.
Move all i18n code to one place. Don't substitute INTLSUB - it's
unused. Substitute INTLDEPS, since AM_GNU_GETTEXT doesn't do it.
Remove SCO-specific i18n hacks. Add -I$(top_srcdir) to CPPFLAGS.
This commit is contained in:
Pavel Roskin 2001-06-29 08:09:37 +00:00
parent 5ff9f80ca8
commit 45d7dee152
4 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2001-06-29 Pavel Roskin <proski@gnu.org>
* Make.common.in (XCPPFLAGS): Don't add -I$(top_srcdir) - it's
now done in configure. Move -I.. to the beginning.
* Makefile.am (SUBDIRS): Move intl po to the beginning, since
libintl.a may be required to link mc.
(ACLOCAL_M4_SOURCES): Remove macros/gnome-gettext.m4.
* configure.in: Use AM_GNU_GETTEXT instead of AM_GNOME_GETTEXT.
Move all i18n code to one place. Don't substitute INTLSUB - it's
unused. Substitute INTLDEPS, since AM_GNU_GETTEXT doesn't do it.
Remove SCO-specific i18n hacks. Add -I$(top_srcdir) to CPPFLAGS.
2001-06-25 Pavel Roskin <proski@gnu.org>
* configure.in: For Autoconf 2.50+, use AC_SYS_LARGEFILE.

2
Make.common.in
View File

@ -49,7 +49,7 @@ AWK = @AWK@
# No way, to make make happy (except GNU), we cannot use := to append
# something to these, so that's why there is a leading _
XCFLAGS = @CFLAGS@
XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -I$(top_srcdir) \
XCPPFLAGS = -I.. @CPPFLAGS@ @MCCPPFLAGS@ \
-DBINDIR=\""$(bindir)/"\" \
-DLIBDIR=\""$(mclibdir)/"\" \
-DICONDIR=\""$(icondir)/"\" \

3
Makefile.am
View File

@ -1,6 +1,6 @@
## Process this file with automake to create Makefile.in.
SUBDIRS = vfs slang edit src lib doc syntax intl po pc \
SUBDIRS = intl po vfs slang edit src lib doc syntax pc \
gtkedit gnome new_icons idl doc-gnome
ACLOCAL_AMFLAGS = -I macros
@ -9,7 +9,6 @@ ACLOCAL_M4_SOURCES = \
macros/gnome.m4 \
macros/gnome-vfs.m4 \
macros/gnome-undelfs.m4 \
macros/gnome-gettext.m4 \
macros/linger.m4
EXTRA_DIST = BUGS FAQ INSTALL.FAST MAINTAINERS \

39
configure.in
View File

@ -41,7 +41,24 @@ fi
ALL_LINGUAS="az ca cs da de el es es_ES fi fr hu it ja ko lv nl no pl pt_BR ro ru sk sl sv uk ta tr wa zh_TW.Big5 zh_CN.GB2312"
AM_GNOME_GETTEXT
dnl
dnl Internationalization
dnl
AM_GNU_GETTEXT
INTLDEPS=
LINTL=
if test "x$USE_INCLUDED_LIBINTL" = xyes; then
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/intl"
LINTL='-L$(top_builddir)/intl -lintl'
INTLDEPS='$(top_builddir)/intl/libintl.a'
fi
AC_SUBST(LINTL)
AC_SUBST(INTLDEPS)
dnl
dnl Hack to make extraconf.h visible even if compiling outside srcdir.
dnl
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)"
dnl
dnl Enforce coding standards
@ -156,14 +173,6 @@ AC_SUBST(LCRYPT)
AC_CHECK_FUNCS(grantpt, , [AC_CHECK_LIB(pt, grantpt)])
dnl
dnl libintl.a required on SCO to provide proper NLS support
dnl (using native cc links it by default)
dnl
if test x$GCC = xyes; then
AC_CHECK_LIB(intl, tolower)
fi
dnl replacing lstat with statlstat on sco makes it more portable between
dnl sco clones
AC_CHECK_FUNCS(statlstat)
@ -614,18 +623,6 @@ AC_ARG_WITH(efence,
mem_debug="Electric Fence"
fi])
INTLSUB=""
LINTL=""
if test x$USE_NLS = xyes; then
if test x$USE_INCLUDED_LIBINTL = xyes; then
CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl"
LINTL="-L\$(top_builddir)/intl -lintl"
fi
INTLSUB=intl
fi
AC_SUBST(INTLSUB)
AC_SUBST(LINTL)
dnl
dnl To force mmap support
dnl We use only part of the functionality of mmap, so on AIX,