Enlightenment CVS committal
Author : xcomputerman
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance
Modified Files:
acconfig.h configure.in
Log Message:
- Link only to ecore libs we actually need
- Check for GL engine support at configure time
- Spawner should not be linking against Evas
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/acconfig.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- acconfig.h 17 Sep 2003 04:31:20 -0000 1.4
+++ acconfig.h 25 Oct 2003 06:51:29 -0000 1.5
@@ -12,3 +12,4 @@
#undef PACKAGE_CFG_DIR
#undef PREFIX
#undef ENTRANCE_XSESSION
+#undef HAVE_ECORE_GL_X11
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- configure.in 23 Oct 2003 05:52:49 -0000 1.16
+++ configure.in 25 Oct 2003 06:51:29 -0000 1.17
@@ -61,24 +61,46 @@
AC_SUBST(edb_libs)
AC_SUBST(edb_cflags)
-AC_PATH_GENERIC(ecore, 0.0.2, [
- AC_SUBST(ecore_libs)
- AC_SUBST(ecore_cflags) ],
- AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
-ecore_libs=`ecore-config --libs`
-ecore_cflags=`ecore-config --cflags`
-AC_SUBST(ecore_libs)
-AC_SUBST(ecore_cflags)
-
AC_PATH_GENERIC(evas, 1.0.0, [
AC_SUBST(evas_libs)
AC_SUBST(evas_cflags) ],
AC_MSG_ERROR(Cannot find evas: Is evas-config in path?))
evas_libs=`evas-config --libs`
evas_cflags=`evas-config --cflags`
+
AC_SUBST(evas_libs)
AC_SUBST(evas_cflags)
+#AC_PATH_GENERIC(ecore, 0.0.2, [
+# AC_SUBST(ecore_libs)
+# AC_SUBST(ecore_cflags) ],
+# AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
+#ecore_libs="-lecore"
+#ecore_cflags=`ecore-config --cflags`
+
+have_ecore_evas=no
+AC_CHECK_HEADERS(Ecore.h Ecore_Evas.h,,
+ AC_MSG_ERROR(Cannot find Ecore headers!))
+
+AC_CHECK_LIB(ecore_evas, main, [
+ ecore_libs="-lecore -lecore_evas"
+ have_ecore_evas=yes],
+ AC_MSG_ERROR(Cannot find ecore_evas!))
+
+have_ecore_software_x11=no
+AC_CHECK_LIB(ecore_evas, ecore_evas_software_x11_new, [
+ have_ecore_software_x11=yes],
+ AC_MSG_ERROR(Ecore_Evas does not have Software/X11 support!))
+
+have_ecore_gl_x11=no
+AC_CHECK_LIB(ecore_evas, ecore_evas_gl_x11_new, [
+ have_ecore_gl_x11=yes
+ AC_DEFINE(HAVE_ECORE_GL_X11)])
+
+ecore_cflags=`ecore-config --cflags`
+AC_SUBST(ecore_libs)
+AC_SUBST(ecore_cflags)
+
AC_PATH_GENERIC(edje, 0.0.1, [
AC_SUBST(edje_libs)
AC_SUBST(edje_cflags) ],
@@ -187,12 +209,13 @@
])
echo
-echo "$PACKAGE $VERSION"
+echo "Finished configuring $PACKAGE $VERSION"
echo
-echo "Support for crypt authentication... $have_crypt"
-echo "Support for shadow authentication... $have_shadow"
-echo "Support for PAM authentication...... $have_pam"
-echo "XSession file to use ...... $xsession "
+echo "OpenGL engine support ............... $have_ecore_gl_x11"
+echo "Support for crypt authentication .... $have_crypt"
+echo "Support for shadow authentication ... $have_shadow"
+echo "Support for PAM authentication ...... $have_pam"
+echo "XSession file to use ................ $xsession "
echo
echo "Now type 'make' (gmake on some systems) to compile $PACKAGE"
echo
-------------------------------------------------------
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community? Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
