From: Enlightenment S. <no-...@en...> - 2011-02-04 11:27:15
|
Log: better gettext support Author: caro Date: 2011-02-04 03:27:07 -0800 (Fri, 04 Feb 2011) New Revision: 56708 Trac: http://trac.enlightenment.org/e/changeset/56708 Modified: trunk/envision/Makefile.am trunk/envision/configure.ac Modified: trunk/envision/Makefile.am =================================================================== --- trunk/envision/Makefile.am 2011-02-04 10:47:24 UTC (rev 56707) +++ trunk/envision/Makefile.am 2011-02-04 11:27:07 UTC (rev 56708) @@ -1,7 +1,11 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src data po +SUBDIRS = src data +if HAVE_PO +SUBDIRS += po +endif + MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ config.h.in config.sub configure install-sh \ ltconfig ltmain.sh missing mkinstalldirs \ Modified: trunk/envision/configure.ac =================================================================== --- trunk/envision/configure.ac 2011-02-04 10:47:24 UTC (rev 56707) +++ trunk/envision/configure.ac 2011-02-04 11:27:07 UTC (rev 56708) @@ -34,8 +34,18 @@ ALL_LINGUAS=`cat po/LINGUAS | grep -v '^[ ]*#'` AC_SUBST(ALL_LINGUAS) +m4_ifdef([AM_GNU_GETTEXT_VERSION], [ AM_GNU_GETTEXT_VERSION([0.12.1]) +]) + +m4_ifdef([AM_GNU_GETTEXT], [ AM_GNU_GETTEXT([external]) +po_makefile_in=po/Makefile.in +AM_CONDITIONAL([HAVE_PO], [true]) +],[ +AM_CONDITIONAL([HAVE_PO], [false]) +]) +AC_SUBST(LTLIBINTL) PKG_CHECK_MODULES([ELEMENTARY], [elementary epdf eina ecore evas edje]) |
From: Enlightenment S. <no-...@en...> - 2011-06-07 05:48:00
|
Log: fix configuration when gettext is not installed Author: caro Date: 2011-06-06 22:47:53 -0700 (Mon, 06 Jun 2011) New Revision: 60022 Trac: http://trac.enlightenment.org/e/changeset/60022 Modified: trunk/envision/configure.ac Modified: trunk/envision/configure.ac =================================================================== --- trunk/envision/configure.ac 2011-06-07 05:35:23 UTC (rev 60021) +++ trunk/envision/configure.ac 2011-06-07 05:47:53 UTC (rev 60022) @@ -102,7 +102,7 @@ data/Makefile data/desktop/Makefile data/themes/Makefile -po/Makefile.in +$po_makefile_in ]) |
From: Enlightenment S. <no-...@en...> - 2011-06-09 07:42:18
|
Log: don't use autoreconf as it can not support optional gettext support (yet) Author: caro Date: 2011-06-09 00:42:10 -0700 (Thu, 09 Jun 2011) New Revision: 60118 Trac: http://trac.enlightenment.org/e/changeset/60118 Modified: trunk/envision/autogen.sh Modified: trunk/envision/autogen.sh =================================================================== --- trunk/envision/autogen.sh 2011-06-09 03:12:09 UTC (rev 60117) +++ trunk/envision/autogen.sh 2011-06-09 07:42:10 UTC (rev 60118) @@ -17,7 +17,12 @@ find . -name Makefile -delete find . -name Makefile.in -delete -autoreconf -i +echo "Running autopoint..." ; autopoint -f || : +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 +echo "Running autoheader..." ; autoheader || exit 1 +echo "Running autoconf..." ; autoconf || exit 1 +echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 +echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 cd $ORIGDIR || exit 1 |
From: Enlightenment S. <no-...@en...> - 2011-10-21 21:23:15
|
Log: Envision: do not enter po/ if --disable-nls is passed to configure Author: caro Date: 2011-10-21 14:23:05 -0700 (Fri, 21 Oct 2011) New Revision: 64272 Trac: http://trac.enlightenment.org/e/changeset/64272 Modified: trunk/envision/configure.ac Modified: trunk/envision/configure.ac =================================================================== --- trunk/envision/configure.ac 2011-10-21 21:20:12 UTC (rev 64271) +++ trunk/envision/configure.ac 2011-10-21 21:23:05 UTC (rev 64272) @@ -41,12 +41,18 @@ m4_ifdef([AM_GNU_GETTEXT], [ AM_GNU_GETTEXT([external]) po_makefile_in=po/Makefile.in -AM_CONDITIONAL([HAVE_PO], [true]) +have_po="yes" ],[ -AM_CONDITIONAL([HAVE_PO], [false]) +have_po="no" ]) AC_SUBST(LTLIBINTL) +if test "x${POSUB}" = "x" ; then + have_po="no" +fi + +AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"]) + PKG_CHECK_MODULES([ELEMENTARY], [elementary epdf eina ecore evas edje]) AC_ARG_WITH([edje-cc], |
From: Enlightenment S. <no-...@en...> - 2011-10-21 21:45:31
|
Log: Envision: fix maintainer-clean rule Author: caro Date: 2011-10-21 14:45:22 -0700 (Fri, 21 Oct 2011) New Revision: 64274 Trac: http://trac.enlightenment.org/e/changeset/64274 Modified: trunk/envision/Makefile.am Modified: trunk/envision/Makefile.am =================================================================== --- trunk/envision/Makefile.am 2011-10-21 21:34:16 UTC (rev 64273) +++ trunk/envision/Makefile.am 2011-10-21 21:45:22 UTC (rev 64274) @@ -6,9 +6,75 @@ SUBDIRS += po endif -MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ - config.h.in config.sub configure install-sh \ - ltconfig ltmain.sh missing mkinstalldirs \ - stamp-h.in acconfig.h depcomp compile +MAINTAINERCLEANFILES = \ +Makefile.in \ +acconfig.h \ +aclocal.m4 \ +compile \ +config.guess \ +config.h.in \ +config.rpath \ +config.sub \ +configure \ +depcomp \ +install-sh \ +ltconfig \ +ltmain.sh \ +missing \ +mkinstalldirs \ +stamp-h.in \ +m4/libtool.m4 \ +m4/lt~obsolete.m4 \ +m4/ltoptions.m4 \ +m4/ltsugar.m4 \ +m4/ltversion.m4 \ +m4/codeset.m4 \ +m4/gettext.m4* \ +m4/glibc2*.m4 \ +m4/iconv.m4 \ +m4/intdiv0.m4 \ +m4/intldir.m4 \ +m4/intl.m4 \ +m4/intlmacosx.m4 \ +m4/intmax.m4* \ +m4/inttypes_h.m4 \ +m4/inttypes.m4 \ +m4/inttypes-pri.m4 \ +m4/isc-posix.m4 \ +m4/lcmessage.m4 \ +m4/lib-ld.m4* \ +m4/lib-link.m4 \ +m4/lib-prefix.m4* \ +m4/lock.m4 \ +m4/longdouble.m4* \ +m4/longlong.m4* \ +m4/nls.m4 \ +m4/po.m4* \ +m4/printf-posix.m4* \ +m4/progtest.m4 \ +m4/signed.m4 \ +m4/size_max.m4* \ +m4/stdint_h.m4 \ +m4/uintmax_t.m4 \ +m4/ulonglong.m4* \ +m4/visibility.m4 \ +m4/wchar_t.m4 \ +m4/wint_t.m4* \ +m4/xsize.m4* +if HAVE_PO + +MAINTAINERCLEANFILES += \ +po/boldquot.sed \ +po/en@boldquot.header \ +po/en@quot.header \ +po/insert-header.sin \ +po/Makefile.in.in* \ +po/Makevars.template \ +po/quot.sed \ +po/remove-potcdate.sin \ +po/Rules-quot* + +endif + EXTRA_DIST = README AUTHORS COPYING |