RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 01-Jul-2007 20:09:26 Branch: HEAD Handle: 2007070119092600 Modified files: rpm/db3 configure Log: fix the passing-through of the arguments by using "$@" now instead of $ARGS; fix indentation on backticks; use "set --" instead of "set -" as that is the portable construct here (tested in GNU shtool since years). Summary: Revision Changes Path 1.34 +4 -4 rpm/db3/configure ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/db3/configure ============================================================================ $ cvs diff -u -r1.33 -r1.34 configure --- rpm/db3/configure 1 Jul 2007 16:12:25 -0000 1.33 +++ rpm/db3/configure 1 Jul 2007 18:09:26 -0000 1.34 @@ -10,7 +10,7 @@ # We iterate over the argument list. Processing the arguments using # echo "$*" can fail with the sed chopping out parts of unrelated # arguments -set - "$@" eoa_marker +set -- "$@" eoa_marker while [ "$1" != "eoa_marker" ]; do ARG=`echo "$1" | \ sed -e 's% [^ ]*CFLAGS=[^ ]*%%' \ @@ -28,9 +28,9 @@ -e 's%--with-db-mutex=\([^ ]*\)%--with-mutex=\1%' \ -e 's%--with-db-mutex%%' \ -e 's%--without-db-mutex%%' \ -` + ` shift - set - "$@" "$ARG" + set -- "$@" "$ARG" done shift @@ -41,7 +41,7 @@ # 2. "--enable-static" is there for enforcing the building of a static # version of the libdb objects RPM actually is interested in. -CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \ +CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure "$@" \ --enable-shared --enable-static \ --with-uniquename=_rpmdb --srcdir=$db_dist @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org