On 04/13/12 22:47, Enlightenment SVN wrote: > Log: > ok- then lets do it the vtorri way - but lets put requirements on > multiple lines so its easier to read. > Agree. reqs on a line by themselves is easier to read.
vt++ dh > > > Author: raster > Date: 2012-04-13 19:47:17 -0700 (Fri, 13 Apr 2012) > New Revision: 70180 > Trac: http://trac.enlightenment.org/e/changeset/70180 > > Modified: > trunk/exquisite/ChangeLog trunk/exquisite/configure.ac > trunk/exquisite/src/bin/Makefile.am > > Modified: trunk/exquisite/ChangeLog > =================================================================== > --- trunk/exquisite/ChangeLog 2012-04-13 20:41:24 UTC (rev 70179) > +++ trunk/exquisite/ChangeLog 2012-04-14 02:47:17 UTC (rev 70180) > @@ -7,9 +7,4 @@ > * add -cleanvt to enable clean "fade out" animation before giving > up the VT. > > -2012-04-13 Carsten Haitzler (The Rasterman) > - > - * Patch from Jérôme Pinot<ngc...@gmail.com> to fix linking > - to ecore_fb (with fix of patch itself to use ecore_fb not ecore). > > - > > Modified: trunk/exquisite/configure.ac > =================================================================== > --- trunk/exquisite/configure.ac 2012-04-13 20:41:24 UTC (rev 70179) > +++ trunk/exquisite/configure.ac 2012-04-14 02:47:17 UTC (rev 70180) > @@ -23,36 +23,30 @@ > AM_PROG_CC_STDC > AM_PROG_CC_C_O > > -requirements="eina>= 1.0.0 eet>= 1.4.0 evas>= 1.0.0 ecore>= 1.0.0 > ecore-evas>= 1.0.0 ecore-con>= 1.0.0 edje>= 1.0.0" > +requirements="\ > + eina>= 1.0.0 \ > + eet>= 1.4.0 \ > + evas>= 1.0.0 \ > + ecore>= 1.0.0 \ > + ecore-evas>= 1.0.0 \ > + ecore-con>= 1.0.0 \ > + edje>= 1.0.0" > +requirements_write="\ > + ecore>= 1.0.0 \ > + ecore-con>= 1.0.0" > > -PKG_CHECK_MODULES([ECORE_FB], > - [ecore-fb>= 1.0.0], > - [ > - have_ecore_fb="yes" > - AC_DEFINE(HAVE_ECORE_FB, 1, [Have Ecore-Fb support]) > - requirements="${requirements} ecore-fb>= 1.0.0" > - ], > - [have_ecore_fb="no"]) > - > -PKG_CHECK_MODULES([EXQUISITE], > +have_ecore_fb="yes" > +PKG_CHECK_EXISTS([ecore-fb>= 1.0.0], > [ > - eina>= 1.0.0 > - eet>= 1.4.0 > - evas>= 1.0.0 > - ecore>= 1.0.0 > - ecore-evas>= 1.0.0 > - ecore-con>= 1.0.0 > - edje>= 1.0.0 > - ]) > + AC_DEFINE(HAVE_ECORE_FB, 1, [Have Ecore-Fb support]) > + requirements="${requirements} \ > + ecore-fb>= 1.0.0" > + ], > + [have_ecore_fb="no"]) > > -PKG_CHECK_MODULES([EXQUISITE_WRITE], > - [ > - ecore>= 1.0.0 > - ecore-evas>= 1.0.0 > - ecore-con>= 1.0.0 > - ]) > +PKG_CHECK_MODULES([EXQUISITE], [${requirements}]) > +PKG_CHECK_MODULES([EXQUISITE_WRITE], [${requirements_write}]) > > - > EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) > > AC_CONFIG_FILES([ > > Modified: trunk/exquisite/src/bin/Makefile.am > =================================================================== > --- trunk/exquisite/src/bin/Makefile.am 2012-04-13 20:41:24 UTC (rev > 70179) > +++ trunk/exquisite/src/bin/Makefile.am 2012-04-14 02:47:17 UTC (rev > 70180) > @@ -14,11 +14,9 @@ > -DPACKAGE_BIN_DIR=\"$(bindir)\" \ > -DPACKAGE_LIB_DIR=\"$(libdir)\" \ > -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ > -@EXQUISITE_CFLAGS@ \ > -@ECORE_FB_CFLAGS@ > +@EXQUISITE_CFLAGS@ > > -exquisite_LDADD = @EXQUISITE_LIBS@ \ > - @ECORE_FB_LIBS@ > +exquisite_LDADD = @EXQUISITE_LIBS@ > > exquisite_write_SOURCES = write.c > exquisite_write_CPPFLAGS = -I. @EXQUISITE_WRITE_CFLAGS@ > > > ------------------------------------------------------------------------------ > For Developers, A Lot Can Happen In A Second. > Boundary is the first to Know...and Tell You. > Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! > http://p.sf.net/sfu/Boundary-d2dvs2 > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn ------------------------------------------------------------------------------ For Developers, A Lot Can Happen In A Second. Boundary is the first to Know...and Tell You. Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! http://p.sf.net/sfu/Boundary-d2dvs2 _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
