On Wed, Sep 5, 2012 at 6:11 AM, Enlightenment SVN <no-re...@enlightenment.org> wrote: > Log: > Autofoo changes based on suggestions from Vtorri, aka Master of the Autofoo > > - pkg-config checks now done in one shot. Also added explicit checks > for Eina, Efreet, and E_Dbus to account for crazy Gentoo use cases. > - PACKAGE_BIN_DIR and PACKAGET_DATA_DIR defined by Makefile.am > > > > Author: mekius > Date: 2012-09-04 21:11:41 -0700 (Tue, 04 Sep 2012) > New Revision: 76160 > Trac: http://trac.enlightenment.org/e/changeset/76160 > > Modified: > trunk/empower/configure.ac trunk/empower/src/bin/Makefile.am > > Modified: trunk/empower/configure.ac > =================================================================== > --- trunk/empower/configure.ac 2012-09-05 02:52:29 UTC (rev 76159) > +++ trunk/empower/configure.ac 2012-09-05 04:11:41 UTC (rev 76160) > > > -PKG_CHECK_MODULES([EVAS], evas, > - [], > +PKG_CHECK_MODULES([EMPOWER], > [ > - echo "Could not find Evas. If it is installed, \nplease make sure its > path is in PKG_CONFIG_PATH"; > - AC_MSG_ERROR([Empower needs Evas to compile.]) > + eina >= 1.7.0, > + evas >= 1.7.0, > + ecore >= 1.7.0, > + ecore-x >= 1.7.0, > + efreet >= 1.7.0, > + edbus >= 1.7.0, > + edje >= 1.7.0, > + elementary >= 1.7.0 > ]
finish the macro here with a ')', so that PKG_CHECK_MODULES throws an error if a package is missing (btw, there was a missing comma, but it's not important anymore) > -) > - > -PKG_CHECK_MODULES([ECORE], [ ecore ecore-x ], > [], > - [ > - echo "Could not find Ecore. If it is installed, \nplease make sure > its path is in PKG_CONFIG_PATH"; > - AC_MSG_ERROR([Empower needs Ecore to compile.]) > - ] > + [] > ) > > -PKG_CHECK_MODULES([EDJE], edje, > - [], > - [ > - echo "Could not find Edje. If it is installed, \nplease make sure its > path is in PKG_CONFIG_PATH"; > - AC_MSG_ERROR([Empower needs Edje to compile.]) > - ] > -) > - > -PKG_CHECK_MODULES([ELEMENTARY], elementary, > - [], > - [ > - echo "Could not find Elementary. If it is installed, \nplease make > sure its path is in PKG_CONFIG_PATH"; > - AC_MSG_ERROR([Empower needs Elementary to compile.]) > - ] > -) > - > -PKG_CHECK_MODULES([EDBUS], edbus, > - [], > - [ > - echo "Could not find Edbus. If it is installed, \nplease make sure > its path is in PKG_CONFIG_PATH"; > - AC_MSG_ERROR([Empower needs Edbus to compile.] > - ] > -) > - > AC_OUTPUT([ > Makefile > empower.spec > > Modified: trunk/empower/src/bin/Makefile.am > =================================================================== > --- trunk/empower/src/bin/Makefile.am 2012-09-05 02:52:29 UTC (rev 76159) > +++ trunk/empower/src/bin/Makefile.am 2012-09-05 04:11:41 UTC (rev 76160) > @@ -1,17 +1,17 @@ > ## Process this file with automake to produce Makefile.in > > -INCLUDES = -I$(top_srcdir) > +INCLUDES = -I$(top_srcdir) \ > + -DPACKAGE_BIN_DIR=\"$(bindir)\" \ > + -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" use AM_CPPFLAGS instead of INCLUDES (the latter is deprecated) > > empower_LDADD = $(INTLLIBS) \ use LTLIBINTL instead of INTLLIBS (compile before committing that one, to be sure) Vincent ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
