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

* configure.in: Move glib test earlier, as it tends to fail for

Browse Source 
many users.  Make GLIB_CONFIG a precious variable.  Check for
glib12-config - that's how it's called on FreeBSD.
Reported by Pavel Shirshov <pavelsh@mail.ru>
This commit is contained in:
Pavel Roskin 2002-08-23 15:56:51 +00:00
parent f0f9c9f1ae
commit 479d96a2ef
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2002-08-23 Pavel Roskin <proski@gnu.org>
* configure.in: Move glib test earlier, as it tends to fail for
many users. Make GLIB_CONFIG a precious variable. Check for
glib12-config - that's how it's called on FreeBSD.
Reported by Pavel Shirshov <pavelsh@mail.ru>
2002-08-22 Pavel Roskin <proski@gnu.org> 2002-08-22 Pavel Roskin <proski@gnu.org>
* configure.in: Remove old-style Linux-only support for shadow * configure.in: Remove old-style Linux-only support for shadow

22
configure.in
View File

@ -11,7 +11,6 @@ AM_INIT_AUTOMAKE(mc, 4.6.0-pre1a)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AC_PROG_LN_S
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_AIX AC_AIX
@ -20,11 +19,24 @@ AC_ISC_POSIX
AC_PROG_CC_STDC AC_PROG_CC_STDC
dnl
dnl Find glib 1.2.x. This check should be kept close to the beginning,
dnl as it tends to fail often.
dnl
dnl Klugde for FreeBSD, where glib-config is renamed to glib12-config.
AC_PATH_PROGS([GLIB_CONFIG], [glib-config glib12-config],,
[$PATH:/usr/local/bin])
AC_ARG_VAR([GLIB_CONFIG], [Path to glib-config])
AM_PATH_GLIB(1.2.0,,[AC_MSG_ERROR([Test for GLIB failed. MC requires GLIB.])])
LIBS="$LIBS $GLIB_LIBS"
AC_HEADER_MAJOR AC_HEADER_MAJOR
AC_C_CONST AC_C_CONST
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
AC_PROG_LN_S
AC_CHECK_TOOL(AR, ar, ar) AC_CHECK_TOOL(AR, ar, ar)
dnl Only list browsers here that can be run in background (i.e. with `&') dnl Only list browsers here that can be run in background (i.e. with `&')
@ -73,12 +85,6 @@ if test "x$GCC" = xyes; then
CFLAGS="$CFLAGS -Wall" CFLAGS="$CFLAGS -Wall"
fi fi
dnl
dnl We now use glib
dnl
AM_PATH_GLIB(1.2.0,,[AC_MSG_ERROR([Test for GLIB failed. MC requires GLIB.])])
LIBS="$LIBS $GLIB_LIBS"
dnl dnl
dnl OS specific flags. dnl OS specific flags.
dnl dnl