From d0ab50f4a92f410b22f015b4f05104c4f23bc3c7 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 27 Jan 2013 09:59:36 +0100 Subject: [PATCH] s/configure.in/configure.ac/ Future autoconf versions will no longer support `configure.in'. --- aclocal.m4 | 4 ++-- autogen.sh | 2 +- configure.in => configure.ac | 2 +- smart-autogen.sh | 3 +-- stepmake/stepmake/generic-targets.make | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) rename configure.in => configure.ac (99%) diff --git a/aclocal.m4 b/aclocal.m4 index 0dcd5bd870..4d5710ba9e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,5 +1,5 @@ dnl aclocal.m4 -*-shell-script-*- -dnl StepMake subroutines for configure.in +dnl StepMake subroutines for configure.ac ### mostly interal macros @@ -140,7 +140,7 @@ AC_DEFUN(STEPMAKE_CHECK_VERSION_UNSUPPORTED, [ fi ]) -### Macros to build configure.in +### Macros to build configure.ac AC_DEFUN(STEPMAKE_BIBTEX2HTML, [ diff --git a/autogen.sh b/autogen.sh index 9d21f79936..46dd22f98b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,7 +7,7 @@ case $1 in --noconf*) NOCONFIGURE=true;; esac -for i in $srcdir/configure.in #`find $srcdir -name configure.in -print` +for i in $srcdir/configure.ac #`find $srcdir -name configure.ac -print` do dir=`dirname $i` echo processing $dir diff --git a/configure.in b/configure.ac similarity index 99% rename from configure.in rename to configure.ac index 954db04cad..2ae2f6cbb9 100644 --- a/configure.in +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl configure.in -*-shell-script-*- +dnl configure.ac -*-shell-script-*- dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) diff --git a/smart-autogen.sh b/smart-autogen.sh index 09d8d95a44..6f4525dac1 100755 --- a/smart-autogen.sh +++ b/smart-autogen.sh @@ -3,7 +3,7 @@ srcdir=${srcdir:-.} set -ux -AUTOGEN_INPUT_CHECKSUM=`cat $srcdir/configure.in $srcdir/aclocal.m4 | md5sum | cut -b 1-32` +AUTOGEN_INPUT_CHECKSUM=`cat $srcdir/configure.ac $srcdir/aclocal.m4 | md5sum | cut -b 1-32` CHECKSUM_FILE=autogen.checksum @@ -14,4 +14,3 @@ fi set -e ${srcdir}/autogen.sh "$@" printf "%s" $AUTOGEN_INPUT_CHECKSUM > $CHECKSUM_FILE - diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index f216898fe8..1b998b938d 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -95,7 +95,7 @@ $(outdir)/version.hh: $(depth)/VERSION $(config_make) $(top-src-dir)/scripts/bui $(outdir)/config.hh: $(config_h) cp -p $< $@ -configure: configure.in aclocal.m4 +configure: configure.ac aclocal.m4 NOCONFIGURE=yes $(src-depth)/autogen.sh chmod +x configure -- 2.39.2