Fixes for internationalization compile on some systems:
I have found the problem with all of those internationalization problems that have been plagging us: Using AM_whatever_GETTEXT Is not everything that is required: we need to call this macro and the magic AC_LINK macro. This macro creates a link in intl from libgettext.h to libintl.h. So, we should be adding -I$builddir/intl and -L$builddir/lib options to the relevant variables if USE_NLS is set to yes. We need to propagate this to the gnome code. Miguel.
Этот коммит содержится в:
родитель
3c6328b4de
Коммит
b50bdac66b
@ -15,6 +15,7 @@ exec_prefix = $(prefix)
|
||||
binprefix =
|
||||
manprefix =
|
||||
|
||||
builddir = @builddir@
|
||||
bindir = $(exec_prefix)/bin
|
||||
libdir = $(exec_prefix)/lib/mc
|
||||
suppbindir = $(libdir)/bin
|
||||
|
@ -5,7 +5,8 @@ rootdir = $(srcdir)
|
||||
@MCFGR@@MCF@
|
||||
|
||||
foreigndirs=nt os2
|
||||
unixdirs=vfs lib doc slang edit src tk xv gnome icons intl @POSUB@
|
||||
codedirs=vfs lib doc slang edit src tk xv gnome icons
|
||||
unixdirs=intl $(codedirs) @POSUB@
|
||||
alldirs=$(unixdirs) $(foreigndirs)
|
||||
subdirs=$(alldirs)
|
||||
|
||||
@ -20,7 +21,7 @@ DISTMAIN = configure configure.in NEWS README INSTALL INSTALL.FAST \
|
||||
README.OS2 VERSION.in NLS mkinstalldirs
|
||||
|
||||
all:
|
||||
@for dir in ${unixdirs}; do \
|
||||
@for dir in ${codedirs} @INTLSUB@ @POSUB@; do \
|
||||
cd $$dir; \
|
||||
${MAKE} all || exit 1; \
|
||||
cd .. ;\
|
||||
|
13
configure.in
13
configure.in
@ -935,6 +935,16 @@ AC_ARG_WITH(efence,
|
||||
mem_debug="Electric Fence"
|
||||
fi])
|
||||
|
||||
INTLSUB=""
|
||||
if test x$USE_NLS = xyes; then
|
||||
if test $ac_cv_header_libintl_h = no; then
|
||||
CPPFLAGS="$CPPFLAGS -I\$(builddir)/intl"
|
||||
LIBS="-L\$(builddir)/intl $LIBS"
|
||||
fi
|
||||
INTLSUB=intl
|
||||
fi
|
||||
AC_SUBST(INTLSUB)
|
||||
|
||||
dnl
|
||||
dnl To force mmap support
|
||||
dnl We use only part of the functionality of mmap, so on AIX,
|
||||
@ -1403,6 +1413,9 @@ else
|
||||
fi
|
||||
AC_SUBST(PCENTRULE)
|
||||
|
||||
AC_SUBST(builddir)
|
||||
builddir=`pwd`
|
||||
|
||||
dnl
|
||||
dnl Output configuration filesn
|
||||
dnl
|
||||
|
@ -1,6 +1,6 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Date: 1998-03-30 15:44:34-0600\n"
|
||||
"Date: 1998-03-30 20:29:54-0600\n"
|
||||
"From: Miguel de Icaza,computo,622-4680 <miguel@metropolis.nuclecu.unam.mx>\n"
|
||||
"Content-Type: text/plain; charset=\n"
|
||||
"Xgettext-Options: --default-domain=mc --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user