mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 22:50:49 +00:00
67 lines
2.4 KiB
Diff
67 lines
2.4 KiB
Diff
diff -rc privoxy-3.0.12-stable/configure.in privoxy-3.0.12-stable-new/configure.in
|
|
*** privoxy-3.0.12-stable/configure.in 2009-03-21 11:45:06.000000000 +0100
|
|
--- privoxy-3.0.12-stable-new/configure.in 2009-10-05 15:39:53.683884809 +0200
|
|
***************
|
|
*** 652,659 ****
|
|
AC_PROG_AWK
|
|
|
|
AC_CHECK_PROG(GDB,gdb,yes,no)
|
|
! AC_PATH_PROG(BGROUPS,groups,no,/bin:/usr/bin:/usr/local/bin)
|
|
! AC_PATH_PROG(ID,id,no,/bin:/usr/bin:/usr/local/bin)
|
|
AC_SUBST(ID)
|
|
AC_SUBST(BGROUPS)
|
|
|
|
--- 652,659 ----
|
|
AC_PROG_AWK
|
|
|
|
AC_CHECK_PROG(GDB,gdb,yes,no)
|
|
! AC_PATH_PROG(BGROUPS,groups,no,$PATH)
|
|
! AC_PATH_PROG(ID,id,no,$PATH)
|
|
AC_SUBST(ID)
|
|
AC_SUBST(BGROUPS)
|
|
|
|
***************
|
|
*** 715,721 ****
|
|
if test $? -eq 0 ; then
|
|
USER=$with_user;
|
|
else
|
|
! AC_MSG_ERROR(There is no user '$with_user' on this system)
|
|
fi
|
|
fi
|
|
else
|
|
--- 715,721 ----
|
|
if test $? -eq 0 ; then
|
|
USER=$with_user;
|
|
else
|
|
! AC_MSG_WARN(There is no user '$with_user' on this system)
|
|
fi
|
|
fi
|
|
else
|
|
***************
|
|
*** 747,758 ****
|
|
# FIXME: this fails if valid group, but not first group
|
|
# listed.
|
|
if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then
|
|
! AC_MSG_ERROR(The given value '$withval' does not match group entry)
|
|
else
|
|
GROUP=$with_group;
|
|
fi
|
|
else
|
|
! AC_MSG_ERROR(There is no group entry for user '$USER')
|
|
fi
|
|
fi
|
|
else
|
|
--- 747,758 ----
|
|
# FIXME: this fails if valid group, but not first group
|
|
# listed.
|
|
if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then
|
|
! AC_MSG_WARN(The given value '$withval' does not match group entry)
|
|
else
|
|
GROUP=$with_group;
|
|
fi
|
|
else
|
|
! AC_MSG_WARN(There is no group entry for user '$USER')
|
|
fi
|
|
fi
|
|
else
|