From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 8 Jul 2017 16:43:00 +0000 (+0200)
Subject: build: Improve lopsub error diagnostics.
X-Git-Tag: v0.6.1~41^2~2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=e4f13789f90c22606dd74b016a71403f3785b884

build: Improve lopsub error diagnostics.

The configure script checks for the lopsubgen executable, the lopsub.h
header file and the liblopsub.a library. If the executable is not
found, we print a short error while a long error message with download
instructions is shown if the header file or the library is missing.

In the common failure case none of the three files is installed,
in which case we print the short message because the check for the
executable comes first. This is unfortunate.

This commit moves the check for the executable to the lopsub section
of configure.ac and prints the long error message if any of the three
files is missing.
---

diff --git a/configure.ac b/configure.ac
index ee1c3d82..6d56e652 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,10 +55,6 @@ AC_PATH_PROG([M4], [m4])
 test -z "$M4" && AC_MSG_ERROR(
 	[The m4 macro processor is required to build this package])
 
-AC_PATH_PROG([lopsubgen], [lopsubgen])
-test -z "$lopsubgen" && AC_MSG_ERROR(
-	[lopsubgen is required to build this package])
-
 AC_PROG_CC
 AC_PROG_CPP
 
@@ -72,9 +68,11 @@ AC_CHECK_LIB([osl], [osl_open_table], [], [HAVE_OSL=no])
 LIB_SUBST_FLAGS(osl)
 UNSTASH_FLAGS
 ######################################################################## lopsub
+HAVE_LOPSUB=yes
+AC_PATH_PROG([lopsubgen], [lopsubgen])
+test -z "$lopsubgen" && HAVE_LOPSUB=no
 STASH_FLAGS
 LIB_ARG_WITH([lopsub], [-llopsub])
-HAVE_LOPSUB=yes
 AC_CHECK_HEADER(lopsub.h, [], [HAVE_LOPSUB=no])
 AC_CHECK_LIB([lopsub], [lls_merge], [], [HAVE_LOPSUB=no])
 if test $HAVE_LOPSUB = no; then AC_MSG_ERROR([