Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 40b9f19

Browse files
committed
Record full paths of programs sought by "configure".
Previously we had a mix of uses of AC_CHECK_PROG[S] and AC_PATH_PROG[S]. The only difference between those macros is that the latter emits the full path to the program it finds, eg "/usr/bin/prove", whereas the former emits just "prove". Let's standardize on always emitting the full path; this is better for documentation of the build, and it might prevent some types of failures if later build steps are done with a different PATH setting. I did not touch the AC_CHECK_PROG[S] calls in ax_pthread.m4 and ax_prog_perl_modules.m4. There seems no need to make those diverge from upstream, since we do not record the programs sought by the former, while the latter's call to AC_CHECK_PROG(PERL,...) will never be reached. Discussion: https://postgr.es/m/25937.1501433410@sss.pgh.pa.us
1 parent b4cc35f commit 40b9f19

File tree

4 files changed

+180
-135
lines changed

4 files changed

+180
-135
lines changed

config/docbook.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# PGAC_PROG_NSGMLS
44
# ----------------
55
AC_DEFUN([PGAC_PROG_NSGMLS],
6-
[AC_CHECK_PROGS([NSGMLS], [onsgmls nsgmls])])
6+
[AC_PATH_PROGS([NSGMLS], [onsgmls nsgmls])])
77

88

99
# PGAC_CHECK_DOCBOOK(VERSION)

config/programs.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
229229
[AC_MSG_ERROR([a gettext implementation is required for NLS])])
230230
AC_CHECK_HEADER([libintl.h], [],
231231
[AC_MSG_ERROR([header file <libintl.h> is required for NLS])])
232-
AC_CHECK_PROGS(MSGFMT, msgfmt)
232+
AC_PATH_PROGS(MSGFMT, msgfmt)
233233
if test -z "$MSGFMT"; then
234234
AC_MSG_ERROR([msgfmt is required for NLS])
235235
fi
@@ -238,8 +238,8 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
238238
pgac_cv_msgfmt_flags=-c
239239
fi])
240240
AC_SUBST(MSGFMT_FLAGS, $pgac_cv_msgfmt_flags)
241-
AC_CHECK_PROGS(MSGMERGE, msgmerge)
242-
AC_CHECK_PROGS(XGETTEXT, xgettext)
241+
AC_PATH_PROGS(MSGMERGE, msgmerge)
242+
AC_PATH_PROGS(XGETTEXT, xgettext)
243243
])# PGAC_CHECK_GETTEXT
244244

245245

0 commit comments

Comments
 (0)