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

* configure.in: Add support for glib 2.x. Right now, it has to

Browse Source 
be explicitly enabled by `--with-glib2'.
From Ali Akcaagac <ali.akcaagac@stud.fh-wilhelmshaven.de>
This commit is contained in:
Pavel Roskin 2002-09-17 13:47:19 +00:00
parent 2d438f6bb7
commit 7dee44f41a
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2002-08-17 Pavel Roskin <proski@gnu.org>
* configure.in: Add support for glib 2.x. Right now, it has to
be explicitly enabled by `--with-glib2'.
From Ali Akcaagac <ali.akcaagac@stud.fh-wilhelmshaven.de>
2002-08-16 Pavel Roskin <proski@gnu.org> 2002-08-16 Pavel Roskin <proski@gnu.org>
* syntax/js.syntax: New file. * syntax/js.syntax: New file.

25
configure.in
View File

@ -19,21 +19,26 @@ AC_ISC_POSIX
AC_PROG_CC_STDC AC_PROG_CC_STDC
dnl dnl
dnl Find glib 1.2.x. This check should be kept close to the beginning, dnl Check if the user requested to compile with glib 2.x. If not, use
dnl as it tends to fail often. 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 dnl
AC_ARG_WITH(glib2, [ --with-glib2 Use glib 2.x [[no]]])
dnl This temporary variable is a workaround for a bug in Autoconf-2.53 if test "x$with_glib2" = "xyes" ; then
glib_path=$PATH:/usr/local/bin PKG_CHECK_MODULES(GLIB, "glib-2.0")
else
dnl This temporary variable is a workaround for a bug in Autoconf-2.53
glib_path=$PATH:/usr/local/bin
dnl Klugde for FreeBSD, where glib-config is renamed to glib12-config. dnl Klugde for FreeBSD, where glib-config is renamed to glib12-config.
AC_PATH_PROGS([GLIB_CONFIG], [glib-config glib12-config],,[$glib_path]) AC_PATH_PROGS([GLIB_CONFIG], [glib-config glib12-config],,[$glib_path])
AC_ARG_VAR([GLIB_CONFIG], [Path to glib-config]) AC_ARG_VAR([GLIB_CONFIG], [Path to glib-config (version 1.2.x only)])
AM_PATH_GLIB(1.2.0,,[AC_MSG_ERROR([Test for GLIB failed. MC requires GLIB.])]) AM_PATH_GLIB(1.2.6,,[AC_MSG_ERROR([Test for glib failed.
AC_SUBST(GLIB_LIBS) GNU Midnight Commander requires glib 1.2.6 or above.])])
fi
AC_HEADER_MAJOR AC_HEADER_MAJOR