summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaka Kranjc2007-01-14 17:38:24 +0100
committerJaka Kranjc2007-01-14 17:38:24 +0100
commitb5ecb6da24dc77bffd68c28546705d24d7f44bb9 (patch)
tree8617b252f6af707ef2c0235c06375cd7a7a36f1e
parent6ccb0fe47a1334be3cfbdbfa2aa63a448ddcc03f (diff)
fixing coreutils to really work with PAM not just by accident (makes it
cast with automake-1.9 in stable-rc) Conflicts: utils/coreutils/HISTORY
-rwxr-xr-xutils/coreutils/BUILD4
-rw-r--r--utils/coreutils/HISTORY5
-rwxr-xr-xutils/coreutils/PRE_BUILD3
3 files changed, 7 insertions, 5 deletions
diff --git a/utils/coreutils/BUILD b/utils/coreutils/BUILD
index ed35eb11a5..67dc13ed2e 100755
--- a/utils/coreutils/BUILD
+++ b/utils/coreutils/BUILD
@@ -1,7 +1,3 @@
-if echo $OPTS | grep -q enable-pam; then
- MAKEFLAG='CPPFLAGS=-DUSE_PAM su_LDFLAGS=-lpam_misc'
-fi &&
-
./configure \
--build=$BUILD \
--bindir=${TRACK_ROOT}/bin \
diff --git a/utils/coreutils/HISTORY b/utils/coreutils/HISTORY
index 95cd27c757..23624b6af2 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,8 @@
+2007-01-14 Thomas Orgis <sobukus@sourcemage.org>
+ * BUILD, PRE_BUILD: fixed the PAM fix, regenerating configure
+ explicitly so that it also works with automake-1.9 in stable-rc,
+ not just with 1.10 by automagic
+
2006-11-07 Flavien Bridault <vlaaad@sourcemage.org>
* DETAILS: Updated to 6.4
* coreutils-pam.patch: Updated (fixes bug #13206), get patch from Arch Linux
diff --git a/utils/coreutils/PRE_BUILD b/utils/coreutils/PRE_BUILD
index f5981b0893..d4e463c4a6 100755
--- a/utils/coreutils/PRE_BUILD
+++ b/utils/coreutils/PRE_BUILD
@@ -6,7 +6,8 @@ cd $SOURCE_DIRECTORY &&
#
if echo $OPTS | grep -q enable-pam; then
message "${MESSAGE_COLOR} linux-pam is enabled ${DEFAULT_COLOR}" &&
- patch -p1 < $SCRIPT_DIRECTORY/coreutils-pam.patch
+ patch -p1 < $SCRIPT_DIRECTORY/coreutils-pam.patch &&
+ autoreconf --force # make sure to give clear situation with automake-1.9
fi &&
#