Enlightenment CVS committal
Author : tilman
Project : e17
Module : libs/edje
Dir : e17/libs/edje
Modified Files:
configure.in edje-config.in
Log Message:
switched edje over to pkg-config. almost. ecore is still detected by
ecore-config, cause that one's gonna be pain.
===================================================================
RCS file: /cvs/e/e17/libs/edje/configure.in,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- configure.in 4 Dec 2006 12:14:17 -0000 1.75
+++ configure.in 21 Mar 2007 02:52:40 -0000 1.76
@@ -78,27 +78,15 @@
]
)
-AC_PATH_GENERIC(evas, 0.9.9,
- [ ],
- [ AC_MSG_ERROR(Evas isn't installed) ],
-)
-
AC_PATH_GENERIC(ecore, 0.9.9,
[ ],
[ AC_MSG_ERROR(Ecore isn't installed) ],
)
-AC_PATH_GENERIC(eet, 0.9.10,
- [ ],
- [ AC_MSG_ERROR(Eet isn't installed) ],
-)
+PKG_CHECK_MODULES(EDJE, [evas >= 0.9.9 eet >= 0.9.10 embryo >= 0.9.1])
-AC_PATH_GENERIC(embryo, 0.9.1,
- [ ],
- [ AC_MSG_ERROR(Embryo isn't installed) ],
-)
-EMBRYO_PREFIX=`$EMBRYO_CONFIG --prefix`
-AC_DEFINE_UNQUOTED(EMBRYO_PREFIX, "${EMBRYO_PREFIX}", [Embryo prefix])
+embryoincludedir=$(pkg-config --variable=embryoincludedir embryo)
+AC_SUBST(embryoincludedir)
AC_MSG_CHECKING([for location of Vim data files])
install_vim="yes";
===================================================================
RCS file: /cvs/e/e17/libs/edje/edje-config.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje-config.in 7 Aug 2006 20:26:33 -0000 1.7
+++ edje-config.in 21 Mar 2007 02:52:40 -0000 1.8
@@ -42,11 +42,11 @@
if test @prefix@/include != /usr/include ; then
includes="[EMAIL PROTECTED]@/include"
fi
- echo $includes @EVAS_CFLAGS@
+ echo $includes @EDJE_CFLAGS@
;;
--libs)
[EMAIL PROTECTED]@
- echo $libdirs -ledje @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@
@fnmatch_libs@ -lm
+ echo $libdirs -ledje @EDJE_LIBS@ @ECORE_LIBS@ @fnmatch_libs@ -lm
;;
--datadir)
echo @prefix@/share/edje
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
