nixpkgs/pkgs/development/libraries/attr/attr-2.4.32.patch

172 lines
4.3 KiB
Diff

diff -rc attr-2.4.32/aclocal.m4 attr-2.4.32.new/aclocal.m4
*** attr-2.4.32/aclocal.m4 2006-06-20 08:51:25.000000000 +0200
--- attr-2.4.32.new/aclocal.m4 2006-08-13 19:57:07.000000000 +0200
***************
*** 144,175 ****
AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
if test -z "$MAKE"; then
! AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
if test -z "$MAKE"; then
! AC_PATH_PROG(MAKE, make,, /usr/bin)
fi
make=$MAKE
AC_SUBST(make)
AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
if test -z "$LIBTOOL"; then
! AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
fi
if test -z "$LIBTOOL"; then
! AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
libtool=$LIBTOOL
AC_SUBST(libtool)
AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
if test -z "$TAR"; then
! AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
fi
tar=$TAR
AC_SUBST(tar)
if test -z "$ZIP"; then
! AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
zip=$ZIP
--- 144,175 ----
AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
if test -z "$MAKE"; then
! AC_PATH_PROG(MAKE, gmake)
fi
if test -z "$MAKE"; then
! AC_PATH_PROG(MAKE, make)
fi
make=$MAKE
AC_SUBST(make)
AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
if test -z "$LIBTOOL"; then
! AC_PATH_PROG(LIBTOOL, glibtool)
fi
if test -z "$LIBTOOL"; then
! AC_PATH_PROG(LIBTOOL, libtool)
fi
libtool=$LIBTOOL
AC_SUBST(libtool)
AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
if test -z "$TAR"; then
! AC_PATH_PROG(TAR, tar)
fi
tar=$TAR
AC_SUBST(tar)
if test -z "$ZIP"; then
! AC_PATH_PROG(ZIP, gzip)
fi
zip=$ZIP
***************
*** 182,206 ****
AC_SUBST(makedepend)
if test -z "$AWK"; then
! AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
fi
awk=$AWK
AC_SUBST(awk)
if test -z "$SED"; then
! AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
fi
sed=$SED
AC_SUBST(sed)
if test -z "$ECHO"; then
! AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
fi
echo=$ECHO
AC_SUBST(echo)
if test -z "$SORT"; then
! AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
fi
sort=$SORT
AC_SUBST(sort)
--- 182,206 ----
AC_SUBST(makedepend)
if test -z "$AWK"; then
! AC_PATH_PROG(AWK, awk)
fi
awk=$AWK
AC_SUBST(awk)
if test -z "$SED"; then
! AC_PATH_PROG(SED, sed)
fi
sed=$SED
AC_SUBST(sed)
if test -z "$ECHO"; then
! AC_PATH_PROG(ECHO, echo)
fi
echo=$ECHO
AC_SUBST(echo)
if test -z "$SORT"; then
! AC_PATH_PROG(SORT, sort)
fi
sort=$SORT
AC_SUBST(sort)
***************
*** 210,223 ****
if test "$enable_gettext" = yes; then
if test -z "$MSGFMT"; then
! AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
msgfmt=$MSGFMT
AC_SUBST(msgfmt)
AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
if test -z "$MSGMERGE"; then
! AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
msgmerge=$MSGMERGE
AC_SUBST(msgmerge)
--- 210,223 ----
if test "$enable_gettext" = yes; then
if test -z "$MSGFMT"; then
! AC_PATH_PROG(MSGFMT, msgfmt)
fi
msgfmt=$MSGFMT
AC_SUBST(msgfmt)
AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
if test -z "$MSGMERGE"; then
! AC_PATH_PROG(MSGMERGE, msgmerge)
fi
msgmerge=$MSGMERGE
AC_SUBST(msgmerge)
***************
*** 225,231 ****
fi
if test -z "$RPM"; then
! AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
fi
rpm=$RPM
AC_SUBST(rpm)
--- 225,231 ----
fi
if test -z "$RPM"; then
! AC_PATH_PROG(RPM, rpm)
fi
rpm=$RPM
AC_SUBST(rpm)