accept autoconf 2.52 too

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5251 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 3811fb341c9371329b451682b62b463231bd164f..2462463275ff813434e992e3073b1bdf8c93f483 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-10  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * autogen.sh: accept autoconf 2.52 too; remove unneeded files
+       depending on autoconf version
+
 2002-08-08  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * .cvsignore: change acconfig.m4 to acconfig.h

diff --git a/autogen.sh b/autogen.sh
index 93be0416fd1f9604cf463add4fd3336d26ca2677..6bc2c8f02e87426afe3ac8c688fd9fcf4d1ae508 100755 (executable)
--- 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 542d7b313c7b5d9e09d594735ea7c74d45050b32..a91c6beb1ee900aaf31da6b6ae253a71c0a3adbe 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,5 +1,8 @@
 2002-09-10  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+       * relyx_configure.ac: 
+       * configure.ac: only require autoconf 2.52
+
        * Makefile.am (EXTRA_DIST): distribute also xforms.m4
 
 2002-08-16  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>

diff --git a/config/configure.ac b/config/configure.ac
index b31cb9ca3d82e003ba893a785ac336e36577dbd3..1435eb925ba1229e023127e6da4e649915aaf95e 100644 (file)
--- 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 45cc6366815aea22c8adb10867c6a8b35b3c0ac5..d5095132a9697cd3b3ef2c3856b69a4c05a5ea50 100644 (file)
--- 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