From: Bruno Haible <bruno@clisp.org>
Date: Mon, 28 Dec 2020 13:40:17 +0000 (+0100)
Subject: autopoint: When both configure.ac and configure.in exist, use the former.
X-Git-Tag: v0.22~279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7a149a65195e69f50b398d1e5a992c1cb221390;p=thirdparty%2Fgettext.git

autopoint: When both configure.ac and configure.in exist, use the former.

Reported by Eric Gallager <egall@gwmail.gwu.edu> in
<https://lists.gnu.org/archive/html/bug-gettext/2020-12/msg00051.html>.

* gettext-tools/misc/autopoint.in (configure_in): Test for configure.ac before
testing for configure.in.
---

diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 3a24eee5d..dfecd5089 100644
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -290,17 +290,17 @@ srcdir=`pwd`
 
 # Check integrity of package: A configure.in/ac must be present. Sets variable
 # - configure_in    name of configure.in/ac file.
-if test -f configure.in; then
-  configure_in=configure.in
+if test -f configure.ac; then
+  configure_in=configure.ac
 else
-  if test -f configure.ac; then
-    configure_in=configure.ac
+  if test -f configure.in; then
+    configure_in=configure.in
   else
     # KDE specific convention: configure.in.in
     if test -f configure.in.in; then
       configure_in=configure.in.in
     else
-      func_fatal_error "Missing configure.in or configure.ac, please cd to your package first."
+      func_fatal_error "Missing configure.ac or configure.in, please cd to your package first."
     fi
   fi
 fi