BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
nixpkgs-suyu/pkgs/development/libraries/acl/acl-2.2.45-patch
Michael Raskin 9849c4fd13 Added acl package and fixed attr package. 
svn path=/nixpkgs/trunk/; revision=9963
2007-12-23 15:09:12 +00:00

222 lines
6.4 KiB
Text
Raw Blame History

diff -u -U3 -r acl-2.2.45-orig/aclocal.m4 acl-2.2.45-mod/aclocal.m4
--- acl-2.2.45-orig/aclocal.m4 2007-12-23 16:16:11.000000000 +0300
+++ acl-2.2.45-mod/aclocal.m4 2007-12-23 18:09:04.000000000 +0300
@@ -228,32 +228,32 @@
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)
+ AC_PATH_PROG(MAKE, gmake,,)
fi
if test -z "$MAKE"; then
- AC_PATH_PROG(MAKE, make,, /usr/bin)
+ 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,, /usr/bin)
+ AC_PATH_PROG(LIBTOOL, glibtool,, )
fi
if test -z "$LIBTOOL"; then
- AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ 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,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
+ AC_PATH_PROG(TAR, tar,, )
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)
+ AC_PATH_PROG(ZIP, gzip,, )
fi
zip=$ZIP
@@ -266,25 +266,25 @@
AC_SUBST(makedepend)
if test -z "$AWK"; then
- AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
+ AC_PATH_PROG(AWK, awk,, )
fi
awk=$AWK
AC_SUBST(awk)
if test -z "$SED"; then
- AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
+ AC_PATH_PROG(SED, sed,, )
fi
sed=$SED
AC_SUBST(sed)
if test -z "$ECHO"; then
- AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
+ AC_PATH_PROG(ECHO, echo,, )
fi
echo=$ECHO
AC_SUBST(echo)
if test -z "$SORT"; then
- AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
+ AC_PATH_PROG(SORT, sort,, )
fi
sort=$SORT
AC_SUBST(sort)
@@ -294,21 +294,21 @@
if test "$enable_gettext" = yes; then
if test -z "$MSGFMT"; then
- AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ 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,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(MSGMERGE, msgmerge,, )
fi
msgmerge=$MSGMERGE
AC_SUBST(msgmerge)
AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
if test -z "$XGETTEXT"; then
- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+ AC_PATH_PROG(XGETTEXT, xgettext,, )
fi
xgettext=$XGETTEXT
AC_SUBST(xgettext)
@@ -316,7 +316,7 @@
fi
if test -z "$RPM"; then
- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
+ AC_PATH_PROG(RPM, rpm,, )
fi
rpm=$RPM
AC_SUBST(rpm)
<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> acl-2.2.45-orig/: configure
diff -u -U3 -r acl-2.2.45-orig/m4/package_utilies.m4 acl-2.2.45-mod/m4/package_utilies.m4
--- acl-2.2.45-orig/m4/package_utilies.m4 2007-12-23 16:16:11.000000000 +0300
+++ acl-2.2.45-mod/m4/package_utilies.m4 2007-12-23 18:01:28.000000000 +0300
@@ -23,32 +23,26 @@
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
@@ -61,25 +55,21 @@
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)
@@ -89,21 +79,18 @@
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)
AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
if test -z "$XGETTEXT"; then
- AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
fi
xgettext=$XGETTEXT
AC_SUBST(xgettext)
@@ -111,7 +98,6 @@
fi
if test -z "$RPM"; then
- AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
fi
rpm=$RPM
AC_SUBST(rpm)
diff -u -U3 -r acl-2.2.45-orig/Makefile acl-2.2.45-mod/Makefile
--- acl-2.2.45-orig/Makefile 2007-12-23 16:16:11.000000000 +0300
+++ acl-2.2.45-mod/Makefile 2007-12-23 18:01:28.000000000 +0300
@@ -33,19 +33,6 @@
endif
$(CONFIGURE):
- autoconf
- ./configure \
- --prefix=/ \
- --exec-prefix=/ \
- --sbindir=/bin \
- --bindir=/usr/bin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --enable-lib64=yes \
- --includedir=/usr/include \
- --mandir=/usr/share/man \
- --datadir=/usr/share \
- $$LOCAL_CONFIGURE_OPTIONS
touch .census
aclocal.m4::
Reference in a new issue View git blame Copy permalink