From 1292eef3093c98a7f92ad9d7071c03ad76bb43db Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 22 Jan 2010 09:17:33 -0700 Subject: Bug 519459 - Semi-hardcoded include and lib directories in db.m4 https://bugzilla.redhat.com/show_bug.cgi?id=519459 Resolves: bug 519459 Bug Description: Semi-hardcoded include and lib directories in db.m4 Reviewed by: nkinder (Thanks!) Branch: HEAD Fix Description: Added --with-db-inc and --with-db-lib to configure. For the default case, check first in /usr/include/db4, then in /usr/include. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no --- compile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'compile') diff --git a/compile b/compile index ec64c622..1b1d2321 100755 --- a/compile +++ b/compile @@ -1,10 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2009-04-28.21; # UTC +scriptversion=2005-05-14.22 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -18,7 +17,8 @@ scriptversion=2009-04-28.21; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then fi # Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` +cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use `[/.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d while true; do if mkdir "$lockdir" >/dev/null 2>&1; then break @@ -138,6 +138,5 @@ exit $ret # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" +# time-stamp-end: "$" # End: -- cgit