From: Vincent T. <vt...@un...> - 2010-02-02 05:27:42
|
On Mon, 1 Feb 2010, Enlightenment SVN wrote: > Modified: > trunk/eina/configure.ac trunk/eina/src/include/eina_str.h trunk/eina/src/lib/Makefile.am trunk/eina/src/lib/eina_str.c > > Modified: trunk/eina/configure.ac > =================================================================== > --- trunk/eina/configure.ac 2010-02-02 02:54:22 UTC (rev 45789) > +++ trunk/eina/configure.ac 2010-02-02 04:49:38 UTC (rev 45790) > @@ -379,6 +379,36 @@ > fi > AC_SUBST(fnmatch_libs) > > +# iconv library > +iconv_cflags="" > +iconv_libs="" > +have_iconv="no" > +AC_ARG_WITH([iconv-link], > + AC_HELP_STRING([--with-iconv-link=ICONV_LINK], [explicitly specify an iconv link option]), > + [ > + iconv_libs=$withval > + have_iconv="yes" > + ]) > + > +AC_MSG_CHECKING(for explicit iconv link options) > +if test "x${iconv_libs}" = "x" ; then > + AC_MSG_RESULT([no explicit iconv link option]) > +else > + AC_MSG_RESULT([$iconv_libs]) > +fi > + > +AM_ICONV that m4 macro is provided by gettext in ecore. I don't see it. I don't know if it is a problem, but iconv.m4 file is licenced as GPL (like gettext). If it's a problem, i'll write one. > + > +if test "x${have_iconv}" = "xno" && test "x${am_cv_func_iconv}" = "xyes" ; then > + iconv_cflags=${LIBICONV} i think i did a mistake in ecore. It's ${INCICONV} here > + iconv_libs=${LTLIBICONV} use directly INCICONV and LTLIBICONV. Less code. I did that for ecore to have the less modifications to do, but now, we can just use them. > + have_iconv="yes" > +fi > + > +AC_SUBST(iconv_cflags) > +AC_SUBST(iconv_libs) no need to AC_SUBST INCICONV and LTLIBICONV after the change > -@EFL_EINA_BUILD@ > +@EFL_EINA_BUILD@ \ > +@iconv_cflags@ > > base_sources = \ > eina_error.c \ > @@ -128,8 +129,8 @@ > endif > > libeina_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ > -libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ > -libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ > +libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ @iconv_libs@ @iconv_libs@ should go in _LIBADD > +libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ @iconv_cflags@ @iconv_cflags@ should go in _CPPFLAGS > +EAPI char * > +eina_str_convert(const char *enc_from, const char *enc_to, const char *text) > +{ > +#ifdef HAVE_ICONV [snip] > +#else > + return NULL; is NULL really what we should return ? Why not test itself ? > +#endif > +} Vincent |
From: Vincent T. <vt...@un...> - 2010-02-02 06:50:56
|
>> +AM_ICONV > > that m4 macro is provided by gettext in ecore. I don't see it. I don't > know if it is a problem, but iconv.m4 file is licenced as GPL (like > gettext). If it's a problem, i'll write one. >> >> libeina_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ >> -libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ >> -libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ >> +libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ @iconv_libs@ > > @iconv_libs@ should go in _LIBADD > >> +libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ @iconv_cflags@ > > @iconv_cflags@ should go in _CPPFLAGS the above is fixed > >> +EAPI char * >> +eina_str_convert(const char *enc_from, const char *enc_to, const char *text) >> +{ >> +#ifdef HAVE_ICONV > > [snip] > >> +#else >> + return NULL; > > is NULL really what we should return ? Why not test itself ? this is not fixed. should i return strdup(txt) ? Vincent |
From: Carsten H. (T. R. <ra...@ra...> - 2010-02-02 07:06:19
|
On Tue, 2 Feb 2010 07:50:48 +0100 (CET) Vincent Torri <vt...@un...> said: > > > >> +AM_ICONV > > > > that m4 macro is provided by gettext in ecore. I don't see it. I don't > > know if it is a problem, but iconv.m4 file is licenced as GPL (like > > gettext). If it's a problem, i'll write one. > >> > >> libeina_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ > >> -libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info > >> @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ -libeina_la_CFLAGS = > >> @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ +libeina_la_LDFLAGS = -no-undefined > >> @lt_enable_auto_import@ -version-info @version_info@ @release_info@ > >> @EFL_PTHREAD_LIBS@ @iconv_libs@ > > > > @iconv_libs@ should go in _LIBADD > > > >> +libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ @iconv_cflags@ > > > > @iconv_cflags@ should go in _CPPFLAGS > > the above is fixed > > > > >> +EAPI char * > >> +eina_str_convert(const char *enc_from, const char *enc_to, const char > >> *text) +{ > >> +#ifdef HAVE_ICONV > > > > [snip] > > > >> +#else > >> + return NULL; > > > > is NULL really what we should return ? Why not test itself ? > > this is not fixed. should i return strdup(txt) ? null is fine. failed conversion. -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) ra...@ra... |