* configure.in: Restore AM_INIT_AUTOMAKE with two arguments for

now, otherwise Automake 1.5 breaks.  Remove version number from
AC_INIT, the version from AM_INIT_AUTOMAKE takes preference.
Substiture RH_VERSION, which is VERSION without dashes, needed
for RedHat specfile.
This commit is contained in:
Pavel Roskin 2002-08-21 15:22:06 +00:00
parent 157d8cd09e
commit e3319c5e37
2 changed files with 15 additions and 5 deletions

View File

@ -1,5 +1,11 @@
2002-08-21 Pavel Roskin <proski@gnu.org>
* configure.in: Restore AM_INIT_AUTOMAKE with two arguments for
now, otherwise Automake 1.5 breaks. Remove version number from
AC_INIT, the version from AM_INIT_AUTOMAKE takes preference.
Substiture RH_VERSION, which is VERSION without dashes, needed
for RedHat specfile.
* configure.in: Bump version to 4.6.0-pre1a. Don't use
arguments in AM_INIT_AUTOMAKE to avoid defining the version in
two places.

View File

@ -2,11 +2,11 @@ dnl
dnl Configure.in file for the Midnight Commander
dnl
AC_INIT([GNU mc], [4.6.0-pre1a], [mc-devel@gnome.org])
AC_PREREQ([2.52])
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE
AC_INIT([GNU Midnight Commander], [], [mc-devel@gnome.org])
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(src/main.c)
AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE(mc, 4.6.0-pre1a)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
@ -692,6 +692,10 @@ AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(LIBS)
dnl Version for the RedHat package, without dashes
RH_VERSION=`echo $VERSION | sed 's/-//'`
AC_SUBST(RH_VERSION)
if test "x$SAMBAFILES" != x; then
AC_CONFIG_SUBDIRS([vfs/samba])
fi