From d5e1314c5d8b3d1d118c2f8f4069421f77e5fe18 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 7 Sep 2001 04:25:02 +0000 Subject: [PATCH] * configure.in: Require Autoconf 2.52. Remove hacks for Autoconf 2.13. * Makefile.am: Require Automake 1.5. --- ChangeLog | 6 ++++++ Makefile.am | 2 ++ configure.in | 20 ++++---------------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7cc28f85c..0a30659d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-09-07 Pavel Roskin + + * configure.in: Require Autoconf 2.52. Remove hacks for + Autoconf 2.13. + * Makefile.am: Require Automake 1.5. + 2001-09-06 Pavel Roskin * syntax/php.syntax: New file - PHP file highlighting. Copied diff --git a/Makefile.am b/Makefile.am index 18503676b..5c81f2092 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ ## Process this file with automake to create Makefile.in. +AUTOMAKE_OPTIONS = 1.5 + SUBDIRS = intl po vfs slang edit src lib doc syntax pc EXTRA_DIST = FAQ INSTALL.FAST MAINTAINERS \ diff --git a/configure.in b/configure.in index 7dd6def06..7c623f57c 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl dnl Configure.in file for the Midnight Commander dnl AC_INIT(src/main.c) -AC_PREREQ(2.13) +AC_PREREQ(2.52) AC_CANONICAL_HOST AM_INIT_AUTOMAKE(mc, 4.5.99a) @@ -19,14 +19,12 @@ AC_AIX AC_MINIX AC_ISC_POSIX -dnl Accomodate both Autoconf 2.13 and the 2.5x series, -ifdef([AC_PROG_CC_STDC], [AC_PROG_CC_STDC], [AM_PROG_CC_STDC]) +AC_PROG_CC_STDC AC_HEADER_MAJOR AC_C_CONST -dnl AC_SYS_LARGEFILE is missing in Autoconf-2.13 -ifelse(AC_ACVERSION, [2.13], [], [AC_SYS_LARGEFILE]) +AC_SYS_LARGEFILE AC_CHECK_TOOL(AR, ar, ar) @@ -818,19 +816,9 @@ AC_SUBST(LIBS) MCF=./Make.common AC_SUBST_FILE(MCF) -dnl -dnl Output configuration files -dnl -dnl Accomodate both Autoconf 2.13 and the 2.5x series. -ifelse(AC_ACVERSION, [2.13], -[mc_subdirs= if test "x$SAMBAFILES" != x; then - mc_subdirs=vfs/samba - AC_CONFIG_SUBDIRS([$mc_subdirs]) -fi], -[if test "x$SAMBAFILES" != x; then AC_CONFIG_SUBDIRS([vfs/samba]) -fi]) +fi AM_CONDITIONAL(USE_EDIT, [test -n "$LIBEDIT_A"]) AM_CONDITIONAL(USE_VFS, [test -n "$LIBVFS"])