debian/07-improve_AC_PATH_PROG_usage.patch

   1 commit 55a9d4458dafd04ad9021f2a8aed7dcc2ccd7171
   2 Author: Mike Frysinger <vapier@gentoo.org>
   3 Date:   Fri Jan 8 22:03:36 2010 -0500
   4
   5     improve AC_PATH_PROG usage
   6
   7     Use AC_PATH_PROG unconditionally and append the search PATH instead of
   8     forcing lookup in a few dirs.  This way we can find the binaries on more
   9     systems where things don't live in the expected locations.
  10
  11     Signed-off-by: Mike Frysinger <vapier@gentoo.org>
  12     Signed-off-by: Brandon Philips <brandon@ifup.org>
  13
  14 diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4
  15 index d8f0726..4de3d3b 100644
  16 --- a/m4/package_utilies.m4
  17 +++ b/m4/package_utilies.m4
  18 @@ -36,55 +36,38 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
  19      AC_SUBST(cc)
  20      AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
  21
  22 -    if test -z "$MAKE"; then
  23 -        AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
  24 -    fi
  25 -    if test -z "$MAKE"; then
  26 -        AC_PATH_PROG(MAKE, make,, /usr/bin)
  27 -    fi
  28 +    search_path="$PATH$PATH_SEPARATOR/usr/freeware/bin$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR/usr/local/bin"
  29 +
  30 +    AC_PATH_PROGS(MAKE, gmake make,, $search_path)
  31      make=$MAKE
  32      AC_SUBST(make)
  33      AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
  34
  35 -    if test -z "$TAR"; then
  36 -        AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
  37 -    fi
  38 +    AC_PATH_PROG(TAR, tar,, $search_path)
  39      tar=$TAR
  40      AC_SUBST(tar)
  41 -    if test -z "$ZIP"; then
  42 -        AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
  43 -    fi
  44
  45 +    AC_PATH_PROG(ZIP, gzip,, $search_path)
  46      zip=$ZIP
  47      AC_SUBST(zip)
  48
  49 -    if test -z "$MAKEDEPEND"; then
  50 -        AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
  51 -    fi
  52 +    AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
  53      makedepend=$MAKEDEPEND
  54      AC_SUBST(makedepend)
  55
  56 -    if test -z "$AWK"; then
  57 -        AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
  58 -    fi
  59 +    AC_PATH_PROG(AWK, awk,, $search_path)
  60      awk=$AWK
  61      AC_SUBST(awk)
  62
  63 -    if test -z "$SED"; then
  64 -        AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
  65 -    fi
  66 +    AC_PATH_PROG(SED, sed,, $search_path)
  67      sed=$SED
  68      AC_SUBST(sed)
  69
  70 -    if test -z "$ECHO"; then
  71 -        AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
  72 -    fi
  73 +    AC_PATH_PROG(ECHO, echo,, $search_path)
  74      echo=$ECHO
  75      AC_SUBST(echo)
  76
  77 -    if test -z "$SORT"; then
  78 -        AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
  79 -    fi
  80 +    AC_PATH_PROG(SORT, sort,, $search_path)
  81      sort=$SORT
  82      AC_SUBST(sort)
  83
  84 @@ -92,23 +75,17 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
  85      AC_PROG_LN_S
  86
  87      if test "$enable_gettext" = yes; then
  88 -        if test -z "$MSGFMT"; then
  89 -                AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
  90 -        fi
  91 +        AC_PATH_PROG(MSGFMT, msgfmt,, $search_path)
  92          msgfmt=$MSGFMT
  93          AC_SUBST(msgfmt)
  94          AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
  95
  96 -        if test -z "$MSGMERGE"; then
  97 -                AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
  98 -        fi
  99 +        AC_PATH_PROG(MSGMERGE, msgmerge,, $search_path)
 100          msgmerge=$MSGMERGE
 101          AC_SUBST(msgmerge)
 102          AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
 103
 104 -        if test -z "$XGETTEXT"; then
 105 -                AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
 106 -        fi
 107 +        AC_PATH_PROG(XGETTEXT, xgettext,, $search_path)
 108          xgettext=$XGETTEXT
 109          AC_SUBST(xgettext)
 110          AC_PACKAGE_NEED_UTILITY($1, "$xgettext", xgettext, gettext)
 111 @@ -116,9 +93,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
 112          AC_DEFINE([ENABLE_GETTEXT], 1, [enable gettext])
 113      fi
 114
 115 -    if test -z "$RPM"; then
 116 -        AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
 117 -    fi
 118 +    AC_PATH_PROG(RPM, rpm,, $search_path)
 119      rpm=$RPM
 120      AC_SUBST(rpm)
 121