[SM-Commit] GIT changes to master grimoire by Thomas Orgis (b76108c735086969e31f5834e65c99c6defc7cf5)

Thomas Orgis scm at mail.sourcemage.org
Sun Jan 14 10:20:44 EST 2007


GIT changes to master grimoire by Thomas Orgis <sobukus at sourcemage.org>:

 utils/coreutils/BUILD     |    4 ----
 utils/coreutils/HISTORY   |    5 +++++
 utils/coreutils/PRE_BUILD |    3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 19559a6f53f64c54843c9498005c345b9bb3dd80
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    fixing coreutils to really work with PAM not just by accident (makes it
    cast with automake-1.9 in stable-rc)

diff --git a/utils/coreutils/BUILD b/utils/coreutils/BUILD
index ed35eb1..67dc13e 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 0f3b44d..925cb5e 100644
--- a/utils/coreutils/HISTORY
+++ b/utils/coreutils/HISTORY
@@ -1,3 +1,8 @@
+2007-01-14 Thomas Orgis <sobukus at 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
+
 2007-01-04 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated PATCHLEVEL as well
 
diff --git a/utils/coreutils/PRE_BUILD b/utils/coreutils/PRE_BUILD
index d43b9a5..48f77aa 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  &&
 
 #



More information about the SM-Commit mailing list