From 838ef4eca1a1fa2c791fa4913a3cae803eb4c8a8 Mon Sep 17 00:00:00 2001 From: David Steele Date: Thu, 12 Mar 2020 09:34:52 -0400 Subject: [PATCH] Move configure.ac to src/build. This file is used to generate src/configure and is not required to make pgbackrest since src/configure is updated before distribution. Move to src/build so it is out of the way. --- src/{ => build}/configure.ac | 0 test/test.pl | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/{ => build}/configure.ac (100%) diff --git a/src/configure.ac b/src/build/configure.ac similarity index 100% rename from src/configure.ac rename to src/build/configure.ac diff --git a/test/test.pl b/test/test.pl index 745798969..385f8dd4b 100755 --- a/test/test.pl +++ b/test/test.pl @@ -454,7 +454,7 @@ eval #----------------------------------------------------------------------------------------------------------------------- if (!$bSmart || grep(/^src\/version\.h/, @stryModifiedList)) { - my $strConfigureAcOld = ${$oStorageTest->get("${strBackRestBase}/src/configure.ac")}; + my $strConfigureAcOld = ${$oStorageTest->get("${strBackRestBase}/src/build/configure.ac")}; my $strConfigureAcNew; foreach my $strLine (split("\n", $strConfigureAcOld)) @@ -469,7 +469,7 @@ eval # Save into the src dir my @stryBuilt; - my $strBuilt = 'src/configure.ac'; + my $strBuilt = 'src/build/configure.ac'; if (buildPutDiffers($oStorageBackRest, "${strBackRestBase}/${strBuilt}", $strConfigureAcNew)) { @@ -484,9 +484,9 @@ eval # Auto-generate configure script #----------------------------------------------------------------------------------------------------------------------- - if (!$bSmart || grep(/^src\/configure\.ac/, @stryModifiedList)) + if (!$bSmart || grep(/^src\/build\/configure\.ac/, @stryModifiedList)) { - my $strConfigure = executeTest("autoconf ${strBackRestBase}/src/configure.ac"); + my $strConfigure = executeTest("autoconf ${strBackRestBase}/src/build/configure.ac"); # Trim off any trailing LFs $strConfigure = trim($strConfigure) . "\n";