On Sun, 30 Jan 2011 09:47:12 +0100 (CET) Vincent Torri <vto...@univ-evry.fr>
said:
>
>
> On Sat, 29 Jan 2011, Enlightenment SVN wrote:
>
> > Log:
> > lock externals to major version of edje.
>
>
>
> > -EDJE_VERSION="1.0.0"
> > +EDJE_VERSION=`pkg-config edje --modversion | awk -F . '{printf("%s.0.0",
> > $1);}'`
>
> in shell, i have 1.0.0, but when i display the value of EDJE_VERSION, i
> get
>
> yes.0.0
wtf? how do you get yes? that's a bit of shell.. and $1 is the first field...
totally bizarre. i get 1.0.0 here. how does the simple 1 liner + awk get
yes.0.0 for you and 1.0.0 for me.. and.. your m4 gets 1.0.0 always? how do they
differ so they both always get 1.0.0??? first... i'd like to know why it doesnt
get the major version right. it's the same issue lurking in both
one thing you are right on - i should use ${PKG_CONFIG} .
now what we need is EDJE_VERSION to be 1.0.0 for edje 1.x.x and 2.0.0 for 2.x.x
etc. etc. - your changes are a bit more extensive than that. lets first figure
out the "yes" thing. why "yes" for you and "1" for me?
> i don't know how to fix that.
>
> below is first a better approach of getting EDJE_VERSION (that is, does
> that only if edje external is chosen)
>
> Vincent
>
> Index: m4/efl_edje_external.m4
> ===================================================================
> --- m4/efl_edje_external.m4 (revision 56398)
> +++ m4/efl_edje_external.m4 (working copy)
> @@ -29,7 +29,7 @@
> _efl_enable_edje_external="no"
> if ! test "x${_efl_want_edje_external}" = "xno" ; then
> PKG_CHECK_MODULES([EDJE_EXTERNAL],
> - [edje],
> + [edje >= 1.0.0],
> [_efl_enable_edje_external="yes"],
> [_efl_enable_edje_external="no"])
> fi
> @@ -41,6 +41,16 @@
> AC_MSG_ERROR([Edje EXTERNAL support requested, but Edje not found by
> pkg-config.]) fi
>
> +if test "x${_efl_enable_edje_external}" = "xyes" ; then
> + EDJE_VERSION=`${PKG_CONFIG} edje --modversion | awk -F . '{printf("%
> s.0.0", $1);}'`
> + AC_MSG_WARN([$host_os-$host_cpu])
> + AC_MSG_WARN([$EDJE_VERSION])
> + MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
> + AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module
> architecture") +fi
> +
> +AC_SUBST(MODULE_EDJE)
> +
> AM_CONDITIONAL([ENABLE_EDJE_EXTERNAL], [test "x
> ${_efl_enable_edje_external}" = "xyes"])
>
> AS_IF([test "x${_efl_enable_edje_external}" = "xyes"], [$1], [$2])
> Index: configure.ac
> ===================================================================
> --- configure.ac (revision 56398)
> +++ configure.ac (working copy)
> @@ -54,25 +54,19 @@
> AC_SUBST(VMAJ)
>
> ### Needed information
> -EDJE_VERSION=`pkg-config edje --modversion | awk -F . '{printf("%s.0.0",
> $1);}'`
>
> want_vlc="no"
> case "$host_os" in
> mingw* | cegcc*)
> - MODULE_EDJE="$host_os-$host_cpu"
> want_xine="no"
> want_gstreamer="yes"
> ;;
> *)
> - MODULE_EDJE="$host_os-$host_cpu-${EDJE_VERSION}"
> want_xine="yes"
> want_gstreamer="yes"
> ;;
> esac
>
> -AC_SUBST(MODULE_EDJE)
> -AC_DEFINE_UNQUOTED(MODULE_EDJE, "$MODULE_EDJE", "Edje module architecture")
> -
> requirement_emotion=""
>
> ### Additional options to configure
> @@ -117,7 +111,7 @@
> requirement_emotion="ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0"
>
> if test "x${have_emotion_test}" = "xyes" ; then
> - PKG_CHECK_MODULES(EMOTION_BIN, [evas >= 1.0.0 ecore >= 1.0.0 ecore-evas
> >= 1.0.0 edje >= ${EDJE_VERSION}])
> + PKG_CHECK_MODULES(EMOTION_BIN, [evas >= 1.0.0 ecore >= 1.0.0 ecore-evas
> >= 1.0.0 edje >= 1.0.0]) fi
>
> PKG_CHECK_MODULES(ECORE_X, [ecore-x >= 1.0.0], [have_ecore_x="yes"],
> [have_ecore_x="no"])
>
>
> ------------------------------------------------------------------------------
> Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
> Finally, a world-class log management solution at an even better price-free!
> Download using promo code Free_Logger_4_Dev2Dev. Offer expires
> February 28th, so secure your free ArcSight Logger TODAY!
> http://p.sf.net/sfu/arcsight-sfd2d
> _______________________________________________
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
------------- Codito, ergo sum - "I code, therefore I am" --------------
The Rasterman (Carsten Haitzler) ras...@rasterman.com
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
