nano

commit cad8493e24b3acfe9d9366f43c4f0c6c95d3b004
parent 6bead051d2404ce5d1fad6b721658e70e2c60d5f
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Thu, 29 Nov 2018 19:36:51 +0100

tweaks: move the checks for git and gettext to a far earlier point

Diffstat:
M
configure.ac
 | 
41
++++++++++++++++++++++-------------------

1 file changed, 22 insertions(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -56,6 +56,28 @@ dnl Data location.
 pkgdatadir=${datadir}/${PACKAGE}
 AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are placed to.])
 
+dnl Whether this is a git repository.
+
+AC_MSG_CHECKING([whether building from git])
+if test -d .git ; then
+	AC_MSG_RESULT([yes])
+	from_git=yes
+else
+	AC_MSG_RESULT([no])
+	from_git=no
+fi
+AM_CONDITIONAL(BUILDING_FROM_GIT, test x$from_git = xyes)
+
+dnl Check for gettext when building from git.
+
+if test x$from_git = xyes; then
+	if test "$ac_cv_path_MSGFMT" = ":"; then
+		AC_MSG_ERROR([
+*** The msgfmt program is missing. ***
+*** The gettext package needs to be installed when building from git. ***])
+	fi
+fi
+
 dnl Checks for header files.
 
 AC_CHECK_HEADERS(libintl.h limits.h pwd.h termios.h sys/param.h)
@@ -751,25 +773,6 @@ else
 fi
 AM_CONDITIONAL(GROFF_HTML, test x$groff_html_support = xyes)
 
-# Check whether this is a git repository.
-AC_MSG_CHECKING([whether building from git])
-if test -d .git ; then
-	AC_MSG_RESULT([yes])
-	from_git=yes
-else
-	AC_MSG_RESULT([no])
-	from_git=no
-fi
-AM_CONDITIONAL(BUILDING_FROM_GIT, test x$from_git = xyes)
-
-if test x$from_git = xyes; then
-	if test "$ac_cv_path_MSGFMT" = ":"; then
-		AC_MSG_ERROR([
-*** The msgfmt program is missing. ***
-*** The gettext package needs to be installed when building from git. ***])
-	fi
-fi
-
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile