SF.net SVN: cel:[3819] cel/branches/release/V1.4
Revision: 3819
http://cel.svn.sourceforge.net/cel/?rev=3819&view=rev
Author: res2002
Date: 2009-02-02 22:49:28 +0000 (Mon, 02 Feb 2009)
Log Message:
-----------
Merged revisions 3817-3818 via svnmerge from
https://cel.svn.sourceforge.net/svnroot/cel/cel/trunk
........
r3817 | res2002 | 2009-02-02 23:03:43 +0100 (Mon, 02 Feb 2009) | 1 line
Update from CS
........
r3818 | res2002 | 2009-02-02 23:04:21 +0100 (Mon, 02 Feb 2009) | 1 line
Use tools prefix when detecting relaytool
........
Modified Paths:
--------------
cel/branches/release/V1.4/configure.ac
cel/branches/release/V1.4/mk/autoconf/crystal.m4
cel/branches/release/V1.4/mk/jam/flags.jam
Property Changed:
----------------
cel/branches/release/V1.4/
Property changes on: cel/branches/release/V1.4
___________________________________________________________________
Modified: svnmerge-integrated
- /cel/trunk:1-3451,3480,3495-3496,3498,3564,3568,3572,3574,3590,3592,3595-3597,3603,3606,3609-3613,3616,3631,3634,3636,3641,3644,3648,3653-3659,3662-3664,3667-3669,3671,3673,3676-3680,3683,3685,3687,3689-3690,3694,3698,3702-3704,3710-3713,3726,3730,3748,3760,3762,3767-3769,3771-3777,3779-3780,3784,3787,3802-3804
+ /cel/trunk:1-3451,3480,3495-3496,3498,3564,3568,3572,3574,3590,3592,3595-3597,3603,3606,3609-3613,3616,3631,3634,3636,3641,3644,3648,3653-3659,3662-3664,3667-3669,3671,3673,3676-3680,3683,3685,3687,3689-3690,3694,3698,3702-3704,3710-3713,3726,3730,3748,3760,3762,3767-3769,3771-3777,3779-3780,3784,3787,3802-3804,3817-3818
Modified: svn:mergeinfo
- /cel/trunk:3480,3564,3568,3572,3574,3590,3592,3595-3597,3603,3606,3609-3613,3616,3631,3634,3644,3655-3659,3662-3664,3667-3668,3671,3673,3676-3680,3683,3685,3687,3689-3690,3694,3698,3702-3704,3710,3726,3730,3748,3760,3776-3777,3779-3780,3784,3787,3802-3804
+ /cel/trunk:3480,3564,3568,3572,3574,3590,3592,3595-3597,3603,3606,3609-3613,3616,3631,3634,3644,3655-3659,3662-3664,3667-3668,3671,3673,3676-3680,3683,3685,3687,3689-3690,3694,3698,3702-3704,3710,3726,3730,3748,3760,3776-3777,3779-3780,3784,3787,3802-3804,3817-3818
Modified: cel/branches/release/V1.4/configure.ac
===================================================================
--- cel/branches/release/V1.4/configure.ac 2009-02-02 22:04:21 UTC (rev 3818)
+++ cel/branches/release/V1.4/configure.ac 2009-02-02 22:49:28 UTC (rev 3819)
<at> <at> -207,7 +207,7 <at> <at>
# Check for relaytool. (After CS check so we can use the version
# shipped with CS.)
#------------------------------------------------------------------------------
-CS_CHECK_COMMON_TOOLS_RELAYTOOL([$CRYSTAL_EXEC_PREFIX/bin])
+CS_CHECK_COMMON_TOOLS_RELAYTOOL([$CRYSTAL_TOOLS_PREFIX/bin])
Modified: cel/branches/release/V1.4/mk/autoconf/crystal.m4
===================================================================
--- cel/branches/release/V1.4/mk/autoconf/crystal.m4 2009-02-02 22:04:21 UTC (rev 3818)
+++ cel/branches/release/V1.4/mk/autoconf/crystal.m4 2009-02-02 22:49:28 UTC (rev 3819)
<at> <at> -185,7 +185,9 <at> <at>
["$cfg" --includedir $cs_liblist])
CRYSTAL_AVAILABLE_LIBS=`"$cfg" --available-libs`
CRYSTAL_STATICDEPS=`"$cfg" --static-deps`
+ CRYSTAL_PREFIX=CS_RUN_PATH_NORMALIZE(["$cfg" --prefix])
CRYSTAL_EXEC_PREFIX=CS_RUN_PATH_NORMALIZE(["$cfg" --exec-prefix])
+ CRYSTAL_TOOLS_PREFIX=CS_RUN_PATH_NORMALIZE(["$cfg" --tools-prefix])
AS_IF([test -z "$CRYSTAL_LIBS"], [cs_sdk=no])])],
[cs_sdk=no])
<at> <at> -207,7 +209,9 <at> <at>
CRYSTAL_VERSION=''
CRYSTAL_LIBS=''
CRYSTAL_INCLUDE_DIR=''
+ CRYSTAL_PREFIX=''
CRYSTAL_EXEC_PREFIX=''
+ CRYSTAL_TOOLS_PREFIX=''
$3])
])
<at> <at> -238,7 +242,9 <at> <at>
AC_SUBST([CRYSTAL_INCLUDE_DIR])
AC_SUBST([CRYSTAL_AVAILABLE_LIBS])
AC_SUBST([CRYSTAL_STATICDEPS])
+AC_SUBST([CRYSTAL_PREFIX])
AC_SUBST([CRYSTAL_EXEC_PREFIX])])
+AC_SUBST([CRYSTAL_TOOLS_PREFIX])])
#------------------------------------------------------------------------------
<at> <at> -265,6 +271,7 <at> <at>
_CS_PATH_CRYSTAL_EMIT([CRYSTAL.AVAILABLE_LIBS],[$CRYSTAL_AVAILABLE_LIBS],[$6])
_CS_PATH_CRYSTAL_EMIT([CRYSTAL.STATICDEPS],[$CRYSTAL_STATICDEPS],[$6])
_CS_PATH_CRYSTAL_EMIT([CRYSTAL.EXEC_PREFIX],[$CRYSTAL_EXEC_PREFIX],[$6])
+_CS_PATH_CRYSTAL_EMIT([CRYSTAL.TOOLS_PREFIX],[$CRYSTAL_TOOLS_PREFIX],[$6])
])
AC_DEFUN([_CS_PATH_CRYSTAL_EMIT],
Modified: cel/branches/release/V1.4/mk/jam/flags.jam
===================================================================
--- cel/branches/release/V1.4/mk/jam/flags.jam 2009-02-02 22:04:21 UTC (rev 3818)
+++ cel/branches/release/V1.4/mk/jam/flags.jam 2009-02-02 22:49:28 UTC (rev 3819)
<at> <at> -241,8 +241,13 <at> <at>
{
echo "" > $(<)
whatever=`echo "$(WHATEVER)" | tr '-' '_' | tr '.' '_' `
- echo "int lib${whatever}_is_present = 1;" >> $(<)
- echo "int lib${whatever}_symbol_is_present (char* s) { return 1; }" >> $(<)
+ my_IFS=$IFS; IFS=" "
+ for w in ${whatever}
+ do
+ echo "int lib${w}_is_present = 1;" >> $(<)
+ echo "int lib${w}_symbol_is_present (char* s) { return 1; }" >> $(<)
+ done
+ IFS=$my_IFS
}
## MergeLFlags flags1 : flags2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open
Source development site.
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com