AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-6506 Allow --detect-prefix and other prefix options to work in icu-config without preinstalling ICU.

Browse Source 
X-SVN-Rev: 24523
This commit is contained in:
Michael Ow 2008-08-26 19:21:46 +00:00
parent 3ff38d32ad
commit 6291dc754d
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
icu4c/source/config/icu-config-bottom
View File

@ -91,10 +91,10 @@ usage()
## Check the sanity of current variables
sanity()
{
if [ ! -f ${ICUUC_FILE} ];
if [ ! -f ${ICUUC_FILE} ] && [ ${IGNORE_ICUUC_FILE_CHECK} = "no" ];
then
echo "### $ME: Can't find ${ICUUC_FILE} - ICU prefix is wrong." 1>&2
echo "### Try the --prefix= or --exec-prefix= options " 1>&2
echo "### Try the --prefix= option " 1>&2
echo "### or --detect-prefix"
echo "### $ME: Exitting." 1>&2
exit 2
@ -108,6 +108,13 @@ if [ $# -lt 1 ]; then
exit 1
fi
# For certain options (e.g. --detect-prefix) don't check for icuuc library file.
IGNORE_ICUUC_FILE_CHECK="no";
case "$1" in
*prefix*)
IGNORE_ICUUC_FILE_CHECK="yes"
;;
esac
# Load our variables from autoconf
# ALWAYS load twice because of dependencies
@ -256,7 +263,6 @@ do
fi
loaddefs
loaddefs
sanity
;;
--exec-prefix)
@ -271,7 +277,6 @@ do
prefix=$var
loaddefs
loaddefs
sanity
;;
--sysconfdir)
@ -351,6 +356,12 @@ do
;;
esac
shift
# Reset the ignore icuuc file check flag
if [ $IGNORE_ICUUC_FILE_CHECK = "yes" ]; then
IGNORE_ICUUC_FILE_CHECK="no"
sanity
fi
done
echo
# Check once before we quit (will check last used prefix)