* configure.in: Fully enable glib2. Update the documentation.
Этот коммит содержится в:
Pavel Roskin
родитель
27899bfa2c
Коммит
aa1573f046
@ -1,3 +1,7 @@
|
||||
2002-11-15 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* configure.in: Fully enable glib2. Update the documentation.
|
||||
|
||||
2002-11-14 Andrew V. Samoilov <sav@bcs.zp.ua>
|
||||
|
||||
* lib/mc.menu: Don't use --repetitive-best option with bzip2 -
|
||||
|
||||
8
INSTALL
8
INSTALL
@ -70,10 +70,6 @@ incomplete, use `configure --help' to get the full list):
|
||||
Print the version of Autoconf used to generate the `configure'
|
||||
script, and exit.
|
||||
|
||||
`--with-glib2'
|
||||
Look for glib 2.0 and newer. Otherwise, only glib 1.2.x will be
|
||||
used. Note that you need pkgconfig installed to use this option.
|
||||
|
||||
`--without-edit'
|
||||
Configure GNU Midnight Commander to be compiled without the
|
||||
built-in file editor. The built-in editor is compiled in by
|
||||
@ -302,9 +298,7 @@ get glib from
|
||||
|
||||
ftp://ftp.gtk.org/pub/gtk/
|
||||
|
||||
Note that only versions 1.2.x are fully supported. Older versions won't
|
||||
even be detected. Newer versions will be detected if `--with-glib2' is
|
||||
specified. Support for glib 2.0 is considered experimental.
|
||||
Note that only versions 1.2.x and 2.0.x are supported.
|
||||
|
||||
Terminal database
|
||||
-----------------
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
Read the INSTALL file for the complete instructions.
|
||||
|
||||
GNU Midnight Commander requires glib. Currently only the 1.2.x series
|
||||
are fully supported. You may already have glib installed, but if you
|
||||
don't, take it from ftp://ftp.gtk.org/pub/gtk/v1.2/
|
||||
GNU Midnight Commander requires glib. Currently the 1.2.x and 2.0.x
|
||||
series are supported. You may already have glib installed, but if you
|
||||
don't, take it from ftp://ftp.gtk.org/pub/gtk/
|
||||
|
||||
GNU Midnight Commander uses the S-Lang screen library by default. It
|
||||
tries the S-Lang library installed on the system. If it's not found,
|
||||
|
||||
2
NEWS
2
NEWS
@ -5,7 +5,7 @@ Changes made after 4.6.0-pre1.
|
||||
- New syntax rules - RPM specfile.
|
||||
- Support for termnet and HSC firewall has heen removed.
|
||||
- mc now creates its own temporary directory, separate for each user.
|
||||
- Experimental support for glib 2.0.x has been added (use --with-glib2).
|
||||
- Support for glib 2.0.x has been added.
|
||||
- Mouse wheel is supported in the internal editor and viewer in xterm
|
||||
compatible terminals that implement wheel events correctly.
|
||||
- mc now complies with the Filesystem Hierarchy Standard and uses
|
||||
|
||||
8
README
8
README
@ -28,11 +28,9 @@ included with this distribution package.
|
||||
Dependencies
|
||||
------------
|
||||
|
||||
To compile the GNU Midnight Commander you need at least to have a copy
|
||||
of the glib library, available at ftp://ftp.gtk.org/pub/gtk/v1.2/
|
||||
Versions 1.2.x are recommended. Older versions are not supported.
|
||||
Support for glib 2.0.x is experimental and has to be explicitly enabled
|
||||
(see file INSTALL).
|
||||
To compile the GNU Midnight Commander you need to have a copy of the
|
||||
glib library version 1.2.x or 2.0.x, available at
|
||||
ftp://ftp.gtk.org/pub/gtk/
|
||||
|
||||
|
||||
Features
|
||||
|
||||
@ -6,8 +6,7 @@ To compile MC from CVS, the following software is required:
|
||||
Autoconf 2.52 and above
|
||||
Automake 1.5 and above
|
||||
Gettext 0.10.38 - 0.10.40 or (preferrably) 0.11.5 and above.
|
||||
Glib 1.2.6 and above on the 1.2.x branch or 2.0.x (experimental, has to
|
||||
be explicitly enabled by `--with-glib2').
|
||||
Glib 1.2.6 and above on the 1.2.x branch or 2.0.x.
|
||||
|
||||
It is recommended that all those tools are installed with the same
|
||||
prefix. Make sure that the tools with the right version are first in
|
||||
|
||||
14
configure.in
14
configure.in
@ -20,15 +20,15 @@ AC_ISC_POSIX
|
||||
AC_PROG_CC_STDC
|
||||
|
||||
dnl
|
||||
dnl Check if the user requested to compile with glib 2.x. If not, use
|
||||
dnl glib 1.2.x. This check should be kept close to the beginning, as it
|
||||
dnl fails for the users without any glib.
|
||||
dnl First try glib 2.x. If it's not found, use glib 1.2.x.
|
||||
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(glib2, [ --with-glib2 Use glib 2.x [[no]]])
|
||||
|
||||
if test "x$with_glib2" = "xyes" ; then
|
||||
PKG_CHECK_MODULES(GLIB, "glib-2.0")
|
||||
else
|
||||
PKG_CHECK_MODULES(GLIB, [glib-2.0], , [glib_found=no])
|
||||
|
||||
dnl Fall back to glib-1.2, don't use pkgconfig to find it.
|
||||
if test "x$glib_found" = "xno" ; then
|
||||
dnl This temporary variable is a workaround for a bug in Autoconf-2.53
|
||||
glib_path=$PATH:/usr/local/bin
|
||||
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
#%define _with_included_slang 1 # use included S-Lang library
|
||||
#%define _with_charset 1 # enable experimental code for charset conversion
|
||||
#%define _with_samba 1 # enable SMB/CIFS virtual file system
|
||||
#%define _with_glib2 1 # compile against glib2
|
||||
#%define _with_ext2undel 1 # compile with ext2 undelete code [if available]
|
||||
|
||||
# Note that this is NOT a relocatable package
|
||||
@ -48,7 +47,6 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" ./configure \
|
||||
%{?_with_included_slang: --with-screen=mcslang} \
|
||||
%{?_with_charset: --enable-charset} \
|
||||
%{?_with_samba: --with-samba} \
|
||||
%{?_with_glib2: --with-glib2} \
|
||||
%{?_with_ext2undel: --with-ext2undel}
|
||||
|
||||
make
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user