ALT Linux repos
Group :: File tools
RPM: mc
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: mc-4.6.1-alt-m4_configure.patch
Download
Download
--- mc/configure.ac.orig 2002-10-30 15:48:41 +0300
+++ mc/configure.ac 2002-10-30 15:48:45 +0300
@@ -37,33 +37,7 @@
fi
dnl Fall back to glib-1.2, don't use pkgconfig to find it.
-if test "x$glib_found" != "xyes" ; then
- 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.
- AC_PATH_PROGS([GLIB_CONFIG], [glib-config glib12-config],,[$glib_path])
-
- AC_ARG_VAR([GLIB_CONFIG], [Path to glib-config (version 1.2.x only)])
- AM_PATH_GLIB(1.2.6, , [AC_MSG_ERROR([Test for glib failed.
-GNU Midnight Commander requires glib 1.2.6 or above.])])
- dnl Save GLIB_CFLAGS and GLIB_LIBS, since the following call to
- dnl AM_PATH_GLIB will overwrite them.
- save_GLIB_CFLAGS="$GLIB_CFLAGS"
- save_GLIB_LIBS="$GLIB_LIBS"
- dnl Check for gmodule. Store the flags necessary to compile and
- dnl link programs using gmodule functionality in GMODULE_CFLAGS
- dnl and GMODULE_LIBS.
- AM_PATH_GLIB(1.2.6, [gmodule_found=yes], , [gmodule])
- GMODULE_CFLAGS="$GLIB_CFLAGS"
- GMODULE_LIBS="$GLIB_LIBS"
- GLIB_CFLAGS="$save_GLIB_CFLAGS"
- GLIB_LIBS="$save_GLIB_LIBS"
- GLIB_LIBDIR="`$GLIB_CONFIG --exec-prefix`/lib"
-
- dnl Used in src/glibcompat.c
- AC_CHECK_FUNCS([strlcpy])
-else
+if test "x$glib_found" = "xyes" ; then
PKG_CHECK_MODULES(GMODULE, [gmodule-2.0], [gmodule_found=yes])
GLIB_LIBDIR="`$PKG_CONFIG --variable=libdir glib-2.0`"
fi
@@ -599,7 +573,6 @@
slang/Makefile
edit/Makefile
syntax/Makefile
-m4/Makefile
lib/mc.ext
vfs/extfs/a
vfs/extfs/apt
--- mc/Makefile.am.orig 2002-10-30 15:55:29 +0300
+++ mc/Makefile.am 2002-10-30 15:55:36 +0300
@@ -2,15 +2,13 @@
AUTOMAKE_OPTIONS = 1.5
-SUBDIRS = intl po m4 vfs slang edit src lib doc syntax
+SUBDIRS = po vfs slang edit src lib doc syntax
EXTRA_DIST = FAQ HACKING INSTALL.FAST MAINTAINERS README.QNX TODO
noinst_DATA = mc.spec mc.qpg pkginfo prototype
dist_noinst_SCRIPTS = build-glib1.sh build-glib2.sh
-ACLOCAL_AMFLAGS = -I m4
-
dist-hook:
cp mc.spec $(distdir)
cp mc.qpg $(distdir)