From d47318adb8ed8e335da6d7f2e7dbb002eb968c98 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 10 Sep 2002 15:00:40 +0000 Subject: [PATCH] accept autoconf 2.52 too git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5251 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 5 +++++ autogen.sh | 7 ++++++- config/ChangeLog | 3 +++ config/configure.ac | 2 +- config/relyx_configure.ac | 2 +- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3811fb341c..2462463275 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-09-10 Jean-Marc Lasgouttes + + * autogen.sh: accept autoconf 2.52 too; remove unneeded files + depending on autoconf version + 2002-08-08 Lars Gullik Bjønnes * .cvsignore: change acconfig.m4 to acconfig.h diff --git a/autogen.sh b/autogen.sh index 93be0416fd..6bc2c8f02e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,10 +7,15 @@ case $autoversion in *2.13) cp config/acconfig.h . cp config/configure.in . + rm -f configure.ac cp config/relyx_configure.in lib/reLyX/configure.in + rm -f lib/reLyX/configure.ac ;; - *2.53) + *2.5[23]) + rm -f acconfig.h + rm -f configure.in cp config/configure.ac . + rm -f lib/reLyX/configure.in cp config/relyx_configure.ac lib/reLyX/configure.ac ;; *) diff --git a/config/ChangeLog b/config/ChangeLog index 542d7b313c..a91c6beb1e 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,5 +1,8 @@ 2002-09-10 Jean-Marc Lasgouttes + * relyx_configure.ac: + * configure.ac: only require autoconf 2.52 + * Makefile.am (EXTRA_DIST): distribute also xforms.m4 2002-08-16 Jean-Marc Lasgouttes diff --git a/config/configure.ac b/config/configure.ac index b31cb9ca3d..1435eb925b 100644 --- a/config/configure.ac +++ b/config/configure.ac @@ -1,7 +1,7 @@ dnl Process with autoconf to generate configure script -*- sh -*- AC_INIT(lyx,1.3.0cvs,lyx-devel@lists.lyx.org) -AC_PREREQ(2.53) +AC_PREREQ(2.52) AC_CONFIG_SRCDIR(src/main.C) AM_CONFIG_HEADER([src/config.h]) diff --git a/config/relyx_configure.ac b/config/relyx_configure.ac index 45cc636681..d5095132a9 100644 --- a/config/relyx_configure.ac +++ b/config/relyx_configure.ac @@ -1,7 +1,7 @@ dnl Process with autoconf to generate configure script -*- sh -*- AC_INIT AC_CONFIG_SRCDIR(reLyX.in) -AC_PREREQ(2.53) +AC_PREREQ(2.52) AC_CONFIG_AUX_DIR(../../config) dnl PACKAGE=reLyX